diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2020-12-23 19:30:46 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2020-12-24 00:25:22 -0500 |
| commit | 1302857b65b981564b9093914f4b4c12fd17d308 (patch) | |
| tree | 166e7ddb3a156af7c6989fabd3ed76f7b4332384 | |
| parent | 509fb89d06f88364556ad04f6c7b66f395168ded (diff) | |
| download | emacs.d-1302857b65b981564b9093914f4b4c12fd17d308.tar.gz | |
Drop use of s
| -rw-r--r-- | init.el | 7 | ||||
| -rw-r--r-- | lisp/km-editing.el | 4 | ||||
| -rw-r--r-- | lisp/km-org.el | 5 |
3 files changed, 8 insertions, 8 deletions
@@ -21,7 +21,6 @@ ;;; Code: (require 'cl-lib) -(require 's) (require 'bind-key) (require 'use-package) @@ -1316,8 +1315,10 @@ (defun km/yas-with-comment (str) (concat comment-start - (unless (s-ends-with? " " comment-start) " ") - str comment-end)) + (and (not (string-suffix-p " " comment-start)) + " ") + str + comment-end)) (defvar km/personal-snippets (file-name-as-directory (expand-file-name "psnippets" diff --git a/lisp/km-editing.el b/lisp/km-editing.el index f11c20b..63ca7d4 100644 --- a/lisp/km-editing.el +++ b/lisp/km-editing.el @@ -21,7 +21,6 @@ ;;; Code: (require 'outline) -(require 's) (require 'select) (require 'thingatpt) (require 'whitespace) @@ -199,7 +198,8 @@ level)." (user-error "Buffer's comment string consists of more than one character")) (save-excursion (widen) - (let ((outline-regexp (concat (s-repeat 4 comment-start) "*"))) + (let ((outline-regexp (concat (make-string 4 (string-to-char comment-start)) + "*"))) (outline-mark-subtree) (narrow-to-region (region-beginning) (region-end))))) diff --git a/lisp/km-org.el b/lisp/km-org.el index 0ade476..aa0b7c0 100644 --- a/lisp/km-org.el +++ b/lisp/km-org.el @@ -24,7 +24,6 @@ (require 'org) (require 'org-link-edit) (require 'ox-ascii) -(require 's) ;;;###autoload (defun km/org-tree-to-indirect-buffer (&optional arg) @@ -165,8 +164,8 @@ current heading." (let ((prop (org-entry-get nil "sort" 'inherit))) (when prop (let* ((current-level (org-current-level)) - (sort-prop (s-split " by " prop)) - (levels (mapcar #'string-to-number (s-split nil (car sort-prop)))) + (sort-prop (split-string prop " by ")) + (levels (mapcar #'string-to-number (split-string (car sort-prop)))) (sorting-type (cadr sort-prop)) sorting-func) (if sorting-type |