From 1302857b65b981564b9093914f4b4c12fd17d308 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Wed, 23 Dec 2020 19:30:46 -0500
Subject: Drop use of s

---
 init.el            | 7 ++++---
 lisp/km-editing.el | 4 ++--
 lisp/km-org.el     | 5 ++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/init.el b/init.el
index 63d6815..9848cd1 100644
--- a/init.el
+++ b/init.el
@@ -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
-- 
cgit v1.2.3