From da35e4ba51e0bda6139f47aec1290eab786f8d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 14:14:04 +0100
Subject: [PATCH 01/31] Replaced s-join with string-join

As per https://github.com/clojure-emacs/clj-refactor.el/issues/293
replacing s.el with subr-x.el

All the `thread-last' got unwound due to the re-write as s.el's `s-join'
expected separator first then the strings. Whereas subr-x.el's
`string-join' expects strings and then the separator.
---
 clj-refactor.el | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 4c2a19ef..a825f62f 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -302,11 +302,12 @@ Otherwise open the file and do the changes non-interactively."
     (otherwise key)))
 
 (defun cljr--key-pairs-with-modifier (modifier keys)
-  (thread-last (string-to-list keys)
-    (seq-map (lambda (it) (cljr--fix-special-modifier-combinations
-                           (concat modifier (char-to-string it)))))
-    (s-join " ")
-    (read-kbd-macro)))
+  (read-kbd-macro
+   (string-join
+    (seq-map
+     (lambda (it)
+       (cljr--fix-special-modifier-combinations (concat modifier (char-to-string it))))
+     (string-to-list keys)) " ")))
 
 (defun cljr--key-pairs-with-prefix (prefix keys)
   (read-kbd-macro (concat prefix " " keys)))
@@ -1340,7 +1341,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-move-form"
     (re-search-forward ns)
     (paredit-forward-up)
     (backward-char)
-    (insert " :refer [" (s-join " " refer-names) "]")))
+    (insert " :refer [" (string-join refer-names  " ") "]")))
 
 (defun cljr--append-names-to-refer (ns names)
   "Append NAMES to the :refer vector for NS"
@@ -1351,7 +1352,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-move-form"
     (re-search-forward ":refer")
     (paredit-forward)
     (backward-char)
-    (insert (format " %s" (s-join " " names)))))
+    (insert (format " %s" (string-join names  " ")))))
 
 (defun cljr--new-require-clause (ns &optional refer-names)
   "Creates a new :require clause for NS.
@@ -1708,7 +1709,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-destructure-keys
     (when (looking-back "\\s_\\|\\sw" 3)
       (paredit-backward))
     (kill-sexp)
-    (insert "{:keys [" (s-join " " (seq-uniq (reverse symbols))) "]"
+    (insert "{:keys [" (string-join (seq-uniq (reverse symbols)) " ") "]"
             (if include-as (concat " :as " symbol) "") "}")))
 
 ;; ------ Cycling ----------
@@ -1948,7 +1949,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-project-clean"
       (goto-char (point-min))
       (while (not (cljr--empty-buffer-p))
         (push (cljr--extract-next-dependency-name) names))
-      (s-join "\n "(seq-sort #'string< names)))))
+      (string-join (seq-sort #'string< names) "\n "))))
 
 (defun cljr--prepare-sort-buffer (sorted-names vectors-and-meta dividing-line)
   (insert sorted-names)
@@ -2556,11 +2557,11 @@ Also adds the alias prefix to all occurrences of public symbols in the namespace
 			      (seq-partition 2)))))
     (when (not (= 0 (length asts-in-bad-state)))
       (user-error (concat "Some namespaces are in a bad state: "
-                          (thread-last asts-in-bad-state
-			    (seq-map
-			     (lambda (it)
-			       (format "error \"%s\" in %s" (car (last (car (last it)))) (car it))))
-			    (s-join "; ")))))))
+                          (string-join
+			   (seq-map
+			    (lambda (it)
+			      (format "error \"%s\" in %s" (car (last (car (last it)))) (car it)))
+			    asts-in-bad-state) "; "))))))
 
 (defun cljr--warm-ast-cache ()
   (cljr--call-middleware-async
@@ -2636,7 +2637,7 @@ str/split => str
 split => ''"
   (cond ((cljr--qualified-symbol-p symbol) (car (s-split "/" symbol)))
         ((s-matches-p "\\w+\\.\\w+" symbol)
-         (s-join "." (butlast (s-split "\\." symbol))))
+	 (string-join (butlast (s-split "\\." symbol)) "."))
         (t "")))
 
 (defun cljr--insert-missing-require (symbol missing-symbol type)
@@ -2832,11 +2833,11 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-hotload-dependen
                 " "))))
 
 (defun cljr--call-middleware-to-find-used-locals (file line column)
-  (s-join " "
-          (cljr--call-middleware-sync
-           (cljr--create-msg "find-used-locals" "file" file "line" line
-                             "column" column)
-           "used-locals")))
+  (string-join
+   (cljr--call-middleware-sync
+    (cljr--create-msg "find-used-locals" "file" file "line" line
+		      "column" column)
+    "used-locals") " "))
 
 (defun cljr--goto-enclosing-sexp ()
   (let ((sexp-regexp (rx (or "(" "#{" "{" "["))))
@@ -3447,9 +3448,7 @@ at PATH."
          (stub (s-concat (cljr--defn-str path)
                          (if path (cljr--symbol-suffix name) name)
                          " ["
-                         (thread-last args
-			   (seq-map-indexed params)
-			   (s-join " "))
+			 (string-join (seq-map-indexed params args)  " ")
                          "]\n$0)")))
     (when path
       (find-file-other-window path)
@@ -3646,7 +3645,7 @@ Updates the names of the function parameters."
             parameter))
     (delete-region (point) (cljr--point-after
                             'cljr--skip-past-whitespace-and-comments))
-    (s-join " " (nreverse parameter))))
+    (string-join (nreverse parameter) " ")))
 
 (defun cljr--maybe-wrap-form ()
   "Insert newlines in or prior to the current form to prevent long lines.
@@ -3900,7 +3899,7 @@ Point is assumed to be at the function being called."
 # RET or C-c C-c when you're happy with your changes.
 # q or C-c C-k to abort. ")
   (goto-char (point-min))
-  (insert (s-join "\n" params))
+  (insert (string-join params "\n"))
   (forward-line -1)
   (when (looking-at-p "&")
     (forward-line 1)

From 7a069133f49adf8c78b260778b193cc5ffcf7c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 14:56:10 +0100
Subject: [PATCH 02/31] Replaced s-trim with string-trim

As per https://github.com/clojure-emacs/clj-refactor.el/issues/293
replacing s.el with subr-x.el
---
 clj-refactor.el | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index a825f62f..f8a65ddb 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -491,7 +491,7 @@ If optional `with-whitespace' is T sexp elements are not trimmed."
       (while (/= (point) end)
         (paredit-forward)
         (let ((sexp-elem (buffer-substring-no-properties beg (point))))
-          (push (if with-whitespace sexp-elem (s-trim sexp-elem)) sexp-elems))
+          (push (if with-whitespace sexp-elem (string-trim sexp-elem)) sexp-elems))
         (setq beg (point)))
       (nreverse sexp-elems))))
 
@@ -573,7 +573,7 @@ list of (fn args) to pass to `apply''"
 
 (defun cljr--whitespacep (s)
   "True if S contains only whitespace."
-  (s-blank? (s-trim s)))
+  (s-blank? (string-trim s)))
 
 (defun cljr--make-room-for-toplevel-form ()
   (if (cljr--whitespacep (buffer-substring-no-properties (point) (point-max)))
@@ -1223,7 +1223,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-stop-referring"
                (str (progn (paredit-forward-up)
                            (paredit-backward-down)
                            (buffer-substring-no-properties beg (point))))
-               (symbols (s-split " " (s-trim str) t)))
+               (symbols (s-split " " (string-trim str) t)))
           (paredit-backward-up)
           (paredit-backward)
           (clojure-delete-and-extract-sexp)
@@ -1294,7 +1294,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-move-form"
                                   (last)
                                   (car)
                                   (replace-regexp-in-string (format target-ns-alias-template ns) "\\1")
-				  (s-trim))))
+				  (string-trim))))
         (goto-char (point-max))
         (cljr--insert-with-proper-whitespace
          (cljr--remove-references-of-target-ns forms ns target-ns-alias))
@@ -1302,7 +1302,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-move-form"
           (cljr--insert-in-ns ":require")
           (thread-last (seq-remove (lambda (it) (s-matches-p (format target-ns-regexp-template ns) it)) requires)
 	    (apply #'concat)
-	    (s-trim)
+	    (string-trim)
 	    (insert))
           (cljr-clean-ns))
         (save-buffer))
@@ -1932,7 +1932,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-project-clean"
 (defun cljr--empty-buffer-p (&optional buffer)
   (let ((buffer (or buffer (current-buffer))))
     (with-current-buffer buffer
-      (s-blank? (s-trim (buffer-substring-no-properties (point-min) (point-max)))))))
+      (s-blank? (string-trim (buffer-substring-no-properties (point-min) (point-max)))))))
 
 (defun cljr--extract-next-dependency-name ()
   (while (not (or (cljr--empty-buffer-p)
@@ -1972,7 +1972,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-project-clean"
   ;;; comments to the end of the buffer
   (goto-char (point-min))
   (while (not (looking-at dividing-line))
-    (let ((dep (s-trim (cljr--extract-region (point) (point-at-eol))))
+    (let ((dep (string-trim (cljr--extract-region (point) (point-at-eol))))
           start end vector-and-meta)
       (forward-line)
       (join-line)
@@ -2005,7 +2005,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-project-clean"
       (cljr--prepare-sort-buffer sorted-names vectors-and-meta dividing-line)
       (cljr--sort-dependency-vectors-with-meta-and-comments dividing-line)
       (thread-last (buffer-substring-no-properties (point) (point-max))
-	s-trim
+	string-trim
 	(s-prepend "[")
 	(s-append "]")))))
 
@@ -2377,7 +2377,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-promote-function
     (cljr--call-middleware-async find-symbol-request callback)))
 
 (defun cljr--first-line (s)
-  (thread-first s s-lines car s-trim))
+  (thread-first s s-lines car string-trim))
 
 (defun cljr--project-relative-path (path)
   "Denormalize PATH to make to make it relative to the project
@@ -3077,7 +3077,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-inline-symbol"
 
 if REMOVE-PACKAGE_VERSION is t get rid of the (package: 20150828.1048) suffix."
   (let ((version (s-replace "snapshot" "-SNAPSHOT"
-                            (s-trim (pkg-info-version-info 'clj-refactor)))))
+                            (string-trim (pkg-info-version-info 'clj-refactor)))))
     (if remove-package-version
         (replace-regexp-in-string " (.*)" "" version)
       version)))
@@ -3748,8 +3748,8 @@ called."
 (defun cljr--append-to-manual-intervention-buffer ()
   "Append the current line to the buffer of stuff requiring
 manual intervention."
-  (let ((line (s-trim (buffer-substring-no-properties
-                       (point-at-bol) (point-at-eol))))
+  (let ((line (string-trim (buffer-substring-no-properties
+			    (point-at-bol) (point-at-eol))))
         (linum (line-number-at-pos))
         (file (buffer-file-name)))
     (with-current-buffer (get-buffer-create cljr--manual-intervention-buffer)

From 38d081a03ee217f891a25ca21a9350a73d266402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 15:04:12 +0100
Subject: [PATCH 03/31] Replaced s-blank? with string-blank-p

As per https://github.com/clojure-emacs/clj-refactor.el/issues/293
replacing s.el with subr-x.el
---
 clj-refactor.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index f8a65ddb..e0dd6220 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -573,7 +573,7 @@ list of (fn args) to pass to `apply''"
 
 (defun cljr--whitespacep (s)
   "True if S contains only whitespace."
-  (s-blank? (string-trim s)))
+  (string-blank-p (string-trim s)))
 
 (defun cljr--make-room-for-toplevel-form ()
   (if (cljr--whitespacep (buffer-substring-no-properties (point) (point-max)))
@@ -1932,7 +1932,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-project-clean"
 (defun cljr--empty-buffer-p (&optional buffer)
   (let ((buffer (or buffer (current-buffer))))
     (with-current-buffer buffer
-      (s-blank? (string-trim (buffer-substring-no-properties (point-min) (point-max)))))))
+      (string-blank-p (string-trim (buffer-substring-no-properties (point-min) (point-max)))))))
 
 (defun cljr--extract-next-dependency-name ()
   (while (not (or (cljr--empty-buffer-p)
@@ -2882,7 +2882,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-extract-function
       (insert "(")
       (when name (insert name))
       (save-excursion
-        (unless (s-blank? unbound)
+        (unless (string-blank-p unbound)
           (insert " " unbound))
         (insert ")"))
       (unless name
@@ -2915,7 +2915,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-add-stubs"
   (let* ((interface (cider-symbol-at-point))
          (prefix? (cljr--symbol-prefix interface))
          (alias? (cljr--resolve-alias prefix?))
-         (interface (if (not (s-blank? prefix?))
+         (interface (if (not (string-blank-p prefix?))
                         (if alias?
                             (format "%s/%s" alias? (cljr--symbol-suffix interface))
                           interface)

From 4b47d413bec6156e3468167888873b0c43819361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 15:08:38 +0100
Subject: [PATCH 04/31] Replaced s-concat with concat

As per https://github.com/clojure-emacs/clj-refactor.el/issues/293
replacing s.el with subr-x.el
---
 clj-refactor.el | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index e0dd6220..195af9b0 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -1323,7 +1323,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-move-form"
            (refer-present-p (cljr--search-forward-within-sexp ":refer" :save-excursion))
            (refer-all-p (cljr--search-forward-within-sexp ":refer :all" :save-excursion))
            (require-present-p (cljr--search-forward-within-sexp
-                               (s-concat ":require [" ns)
+                               (concat ":require [" ns)
                                :save-excursion)))
       (if ns-present-p
           (unless (or refer-all-p (null refer-names))
@@ -1977,14 +1977,14 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-project-clean"
       (forward-line)
       (join-line)
       (re-search-forward dividing-line)
-      (re-search-forward (s-concat "\\[" dep "\\s-+\""))
+      (re-search-forward (concat "\\[" dep "\\s-+\""))
       (paredit-backward-up 2)
       (while (not (looking-back "^\\s-*" (point-at-bol)))
         (forward-char -1))
       (while (save-excursion (forward-line -1) (cljr--comment-line-p))
         (forward-line -1))
       (setq start (point))
-      (re-search-forward (s-concat "\\[" dep "\\s-+\""))
+      (re-search-forward (concat "\\[" dep "\\s-+\""))
       (setq end (max (point-at-eol)
                      (cljr--point-after
                       '(paredit-forward-up 2) '(move-end-of-line 1))))
@@ -2801,7 +2801,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-add-missing-libs
     (goto-char (point-min))
     (cl-assert (cljr--looking-at-dependency-vector-p) nil
 	       (format
-		(s-concat "Expected dependency vector of type "
+		(concat "Expected dependency vector of type "
 			  "[org.clojure \"1.7.0\"], but got '%s'")
 		string)))
   string)
@@ -2825,7 +2825,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-hotload-dependen
 (defun cljr--defn-str (&optional public)
   (if public
       "(defn "
-    (s-concat "(defn"
+    (concat "(defn"
               (if cljr-favor-private-functions
                   (if clojure-use-metadata-for-privacy
                       " ^:private "
@@ -3445,7 +3445,7 @@ at PATH."
                    (format "${%s:%s}" (+ i 1)
                            (or (and word (cljr--guess-param-name word))
                                (format "arg%s" i)))))
-         (stub (s-concat (cljr--defn-str path)
+         (stub (concat (cljr--defn-str path)
                          (if path (cljr--symbol-suffix name) name)
                          " ["
 			 (string-join (seq-map-indexed params args)  " ")

From 46f2a2fbccae498df738f29f6bb1f049b5ffb6d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 15:15:06 +0100
Subject: [PATCH 05/31] Replace s-starts-with-p with string-prefix-p

As per https://github.com/clojure-emacs/clj-refactor.el/issues/293
replacing s.el functions with the ones that come as default with Emacs
---
 clj-refactor.el | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 195af9b0..33fb64b5 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -791,7 +791,7 @@ A new record is created to define this constructor."
 (defun cljr--buffers-visiting-dir (dir)
   (seq-filter (lambda (buf)
                 (when-let (path (buffer-file-name buf))
-                  (s-starts-with-p dir path :ignore-case)))
+                  (string-prefix-p dir path :ignore-case)))
               (buffer-list)))
 
 (defun cljr--revisit-buffers (buffers new-dir active)
@@ -2706,15 +2706,15 @@ Date. -> Date
   (cond
    ((s-ends-with-p "." name)
     (thread-last name (s-chop-suffix ".") cljr--normalize-symbol-name))
-   ((s-starts-with-p "#'" name)
+   ((string-prefix-p "#'" name)
     (thread-last name (s-chop-prefix "#'") cljr--normalize-symbol-name))
-   ((s-starts-with-p "'" name)
+   ((string-prefix-p "'" name)
     (thread-last name (s-chop-prefix "'") cljr--normalize-symbol-name))
-   ((s-starts-with-p "~" name)
+   ((string-prefix-p "~" name)
     (thread-last name (s-chop-prefix "~") cljr--normalize-symbol-name))
-   ((s-starts-with-p "~@" name)
+   ((string-prefix-p "~@" name)
     (thread-last name (s-chop-prefix "~@") cljr--normalize-symbol-name))
-   ((s-starts-with-p "@" name)
+   ((string-prefix-p "@" name)
     (thread-last name (s-chop-prefix "@") cljr--normalize-symbol-name))
    (t name)))
 
@@ -2991,7 +2991,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-add-stubs"
 
 (defun cljr--inline-symbol (definition occurrences)
   (let* ((def (gethash :definition definition))
-         (inline-fn-p (s-starts-with-p "(fn" def)))
+         (inline-fn-p (string-prefix-p "(fn" def)))
     (dolist (symbol-meta (cljr--sort-occurrences occurrences))
       (let* ((file (cljr--get-valid-filename symbol-meta))
              (line-beg (gethash :line-beg symbol-meta))
@@ -3315,7 +3315,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
       (cljr--extract-sexp-as-list))))
 
 (defun cljr--unwind-s (s)
-  (if (s-starts-with-p "(->" s)
+  (if (string-prefix-p "(->" s)
       (cljr--with-string-content s
         (clojure-unwind-all)
         (buffer-substring (point-min) (point-max)))
@@ -3370,9 +3370,9 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
       (cljr--strip-keyword-ns (match-string 1 prepped-form)))
      ((and fn-call (s-ends-with-p "." fn-call))
       (s-dashed-words (car (last (s-split "\\." fn-call t)))))
-     ((and fn-call (s-starts-with-p "create-" fn-call))
+     ((and fn-call (string-prefix-p "create-" fn-call))
       (s-chop-prefix "create-" fn-call))
-     ((and fn-call (s-starts-with-p ".get" fn-call))
+     ((and fn-call (string-prefix-p ".get" fn-call))
       (s-dashed-words (s-chop-prefix ".get" fn-call)))
      ((string= "get-in" fn-call)
       (cljr--find-param-name-from-get-in prepped-form))
@@ -3687,7 +3687,7 @@ Updates the ordering of the function parameters."
                                  (cljr--signature-change-at-index
                                   signature-changes i))))
           (insert (seq-find (lambda (param)
-			      (s-starts-with-p old-name param))
+			      (string-prefix-p old-name param))
 			    parameters)))
         (unless (= (1+ i) (length parameters))
           (insert " ")))

From 5c116f597c844d1041c892d6a3a5d7de4c9b6778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 15:19:26 +0100
Subject: [PATCH 06/31] Replace s-(suf|pre)fix-p with string-(suf|pre)fix-p

As per https://github.com/clojure-emacs/clj-refactor.el/issues/293
replacing s.el functions with the ones that come as default with Emacs
---
 clj-refactor.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 33fb64b5..16cb311a 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -946,8 +946,8 @@ If CLJS? is T we insert in the cljs part of the ns declaration."
          (test-name (car (last ns-chunks)))
          (src-dir-name (s-replace "test/" "src/" (file-name-directory test-file)))
          (replace-underscore (apply-partially 's-replace "_" "-"))
-         (src-ns (car (seq-filter (lambda (it) (or (s-prefix-p it test-name)
-                                                   (s-suffix-p it test-name)))
+         (src-ns (car (seq-filter (lambda (it) (or (string-prefix-p it test-name)
+                                                   (string-suffix-p it test-name)))
                                   (seq-map (lambda (file-name)
                                              (funcall replace-underscore
                                                       (file-name-sans-extension file-name)))

From 43e229db08f4cadc4f4d8284d897d9750c8ca323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 15:29:43 +0100
Subject: [PATCH 07/31] Replaces s-equals-p with string-equal

As per https://github.com/clojure-emacs/clj-refactor.el/issues/293
replacing s.el functions with the ones that come as default with Emacs
---
 clj-refactor.el | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 16cb311a..e6bd8b64 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -957,19 +957,19 @@ If CLJS? is T we insert in the cljs part of the ns declaration."
 
 (defun cljr--cljs-file-p (&optional buf)
   "Is BUF, or the current buffer, visiting a cljs file?"
-  (s-equals-p (file-name-extension (buffer-file-name (or buf (current-buffer))))
-              "cljs"))
+  (string-equal (file-name-extension (buffer-file-name (or buf (current-buffer))))
+		"cljs"))
 
 (defun cljr--cljc-file-p (&optional buf)
   "Is BUF, or the current buffer, visiting a cljc file?"
-  (s-equals-p (file-name-extension (buffer-file-name (or buf (current-buffer))))
-              "cljc"))
+  (string-equal (file-name-extension (buffer-file-name (or buf (current-buffer))))
+		"cljc"))
 
 (defun cljr--clj-file-p (&optional buf)
   "Is BUF, or the current buffer, visiting a clj file?"
   (or (eq major-mode 'clojure-mode)
-      (s-equals-p (file-name-extension (buffer-file-name (or buf (current-buffer))))
-                  "clj")))
+      (string-equal (file-name-extension (buffer-file-name (or buf (current-buffer))))
+		    "clj")))
 
 (defun cljr--add-test-declarations ()
   (save-excursion
@@ -1797,9 +1797,9 @@ FEATURE is either :clj or :cljs."
       (when (cljr--cljc-file-p)
         (if (cljr--point-in-reader-conditional-p)
             (cljr--point-in-reader-conditional-branch-p :clj)
-          (s-equals-p (cljr--prompt-user-for "Language context at point? "
-                                             (list "clj" "cljs"))
-                      "clj")))))
+          (string-equal (cljr--prompt-user-for "Language context at point? "
+					       (list "clj" "cljs"))
+			"clj")))))
 
 (defun cljr--aget (map key)
   (cdr (assoc key map)))
@@ -1819,7 +1819,7 @@ FEATURE is either :clj or :cljs."
 
 (defun cljr--js-alias-p (alias)
   (and (cljr--cljs-file-p)
-       (s-equals-p "js" alias)))
+       (string-equal "js" alias)))
 
 (defun cljr--magic-requires-lookup-alias ()
   "Return (alias (ns.candidate1 ns.candidate1)) if we recognize
@@ -2738,10 +2738,10 @@ itself might be `nil'."
       (error (format "Error in nrepl-refactor: %s" err))
     (let* ((maybe-error-and-rest
             (seq-drop-while (lambda (e)
-			      (not (and (stringp e) (s-equals-p e "error"))))
+			      (not (and (stringp e) (string-equal e "error"))))
 			    response))
            (maybe-error (car maybe-error-and-rest)))
-      (when (and (stringp maybe-error) (s-equals-p maybe-error "error"))
+      (when (and (stringp maybe-error) (string-equal maybe-error "error"))
         (or (cadr maybe-error-and-rest)
             (format "Error 'nil' returned from middleware. %s"
                     "Please contact your local administrator."))))))
@@ -3089,8 +3089,8 @@ if REMOVE-PACKAGE_VERSION is t get rid of the (package: 20150828.1048) suffix."
   "Check whether clj-refactor and nrepl-refactor versions are the same"
   (let ((refactor-nrepl-version (or (cljr--middleware-version)
                                     "n/a")))
-    (unless (s-equals-p (s-downcase refactor-nrepl-version)
-                        (s-downcase (cljr--version :remove-package-version)))
+    (unless (string-equal (s-downcase refactor-nrepl-version)
+			  (s-downcase (cljr--version :remove-package-version)))
       (cider-repl-emit-interactive-stderr
        (format "WARNING: clj-refactor and refactor-nrepl are out of sync.
 Their versions are %s and %s, respectively.

From a380f8e5286a775a928861fc39fb3d1edcd4a223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 15:34:43 +0100
Subject: [PATCH 08/31] Replaced s-ends-with-p with string-suffix-p

As per https://github.com/clojure-emacs/clj-refactor.el/issues/293
replacing s.el functions with the ones that come as default with Emacs
---
 clj-refactor.el | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index e6bd8b64..529a969d 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -801,7 +801,7 @@ A new record is created to define this constructor."
 ACTIVE is the buffer the user was looking at when the command was
 issued, and should be left focused."
   (let ((files (directory-files new-dir))
-        (new-dir (if (s-ends-with-p "/" new-dir) new-dir (format "%s/" new-dir)))
+        (new-dir (if (string-suffix-p "/" new-dir) new-dir (format "%s/" new-dir)))
         (same-file (lambda (buf f)
                      (when (string= (file-name-nondirectory f)
                                     (file-name-nondirectory (buffer-file-name buf)))
@@ -1001,14 +1001,14 @@ word test in it and whether the file lives under the test/ directory."
       (string-match-p "/test" (buffer-file-name))))
 
 (defun cljr--clojure-ish-filename-p (file-name)
-  (or (s-ends-with-p ".clj" file-name)
-      (s-ends-with-p ".cljs" file-name)
-      (s-ends-with-p ".cljx" file-name)
-      (s-ends-with-p ".cljc" file-name)))
+  (or (string-suffix-p ".clj" file-name)
+      (string-suffix-p ".cljs" file-name)
+      (string-suffix-p ".cljx" file-name)
+      (string-suffix-p ".cljc" file-name)))
 
 (defun cljr--clojure-filename-p (&optional file-name)
-  (or (s-ends-with-p ".clj" (or file-name (buffer-file-name)))
-      (s-ends-with-p ".cljc" (or file-name (buffer-file-name)))))
+  (or (string-suffix-p ".clj" (or file-name (buffer-file-name)))
+      (string-suffix-p ".cljc" (or file-name (buffer-file-name)))))
 
 (defun cljr--add-ns-if-blank-clj-file ()
   (ignore-errors
@@ -2704,7 +2704,7 @@ Date. -> Date
 ~sym => sym
 ~@sym => sym"
   (cond
-   ((s-ends-with-p "." name)
+   ((string-suffix-p "." name)
     (thread-last name (s-chop-suffix ".") cljr--normalize-symbol-name))
    ((string-prefix-p "#'" name)
     (thread-last name (s-chop-prefix "#'") cljr--normalize-symbol-name))
@@ -3368,7 +3368,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
       prepped-form)
      ((cljr--keyword-lookup-p prepped-form)
       (cljr--strip-keyword-ns (match-string 1 prepped-form)))
-     ((and fn-call (s-ends-with-p "." fn-call))
+     ((and fn-call (string-suffix-p "." fn-call))
       (s-dashed-words (car (last (s-split "\\." fn-call t)))))
      ((and fn-call (string-prefix-p "create-" fn-call))
       (s-chop-prefix "create-" fn-call))
@@ -3721,7 +3721,7 @@ to here:  (defn foo [|bar baz] ...)"
     (ignore-errors
       (paredit-backward-up)
       (paredit-forward-down)
-      (s-ends-with-p (cljr--symbol-suffix fn) (cider-symbol-at-point)))))
+      (string-suffix-p (cljr--symbol-suffix fn) (cider-symbol-at-point)))))
 
 (defun cljr--no-changes-to-parameter-order-p (signature-changes)
   (seq-every-p (lambda (e) (= (gethash :new-index e) (gethash :old-index e)))

From 435615ecf5a49e0c91d1bbcc51f6aa0e23869345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 15:56:02 +0100
Subject: [PATCH 09/31] Replaced s-replace

As per https://github.com/clojure-emacs/clj-refactor.el/issues/293
replacing s.el functions with the ones that come as default with Emacs
---
 clj-refactor.el | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 529a969d..8cfc0bf7 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -944,8 +944,8 @@ If CLJS? is T we insert in the cljs part of the ns declaration."
 (defun cljr--find-source-ns-of-test-ns (test-ns test-file)
   (let* ((ns-chunks (split-string test-ns "[.]" t))
          (test-name (car (last ns-chunks)))
-         (src-dir-name (s-replace "test/" "src/" (file-name-directory test-file)))
-         (replace-underscore (apply-partially 's-replace "_" "-"))
+	 (src-dir-name (replace-regexp-in-string "test/" "src/" (file-name-directory test-file) t t))
+	 (replace-underscore (apply-partially 'replace-regexp-in-string "_" "-"))
          (src-ns (car (seq-filter (lambda (it) (or (string-prefix-p it test-name)
                                                    (string-suffix-p it test-name)))
                                   (seq-map (lambda (file-name)
@@ -1028,7 +1028,7 @@ word test in it and whether the file lives under the test/ directory."
   (if (and (cljr--dash-in-file-name-p file-name)
            (yes-or-no-p "The file name contains dashes. Replace with underscores? "))
       (concat (file-name-directory file-name)
-              (s-replace "-" "_" (file-name-nondirectory file-name)))
+	      (replace-regexp-in-string "-" "_" (file-name-nondirectory file-name)))
     file-name))
 
 (defun cljr--ensure-no-dashes-in-filename ()
@@ -2676,7 +2676,7 @@ to create an alias or refer."
            ;; will prefer - over _ when naming namespaces :(
            (progn (cljr--insert-missing-require
                    symbol
-                   (s-replace "_" "-" (format "%s" missing-symbol)) type)
+                   (replace-regexp-in-string "_" "-" (format "%s" missing-symbol)) type)
                   (cljr--insert-missing-import missing-symbol)))
           ((eq type :class) (cljr--insert-missing-import missing-symbol))
           (t (error (format "Unknown type %s" type))))))
@@ -2748,7 +2748,7 @@ itself might be `nil'."
 
 (defun cljr--format-escape (msg)
   "Make the message consumable by format."
-  (s-replace "%" "%%" msg))
+  (replace-regexp-in-string "%" "%%" msg))
 
 (defun cljr--maybe-rethrow-error (response)
   (if-let (err (cljr--get-error-value response))
@@ -3076,8 +3076,8 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-inline-symbol"
   "Get the version of `clj-refactor' from the package header.
 
 if REMOVE-PACKAGE_VERSION is t get rid of the (package: 20150828.1048) suffix."
-  (let ((version (s-replace "snapshot" "-SNAPSHOT"
-                            (string-trim (pkg-info-version-info 'clj-refactor)))))
+  (let ((version (replace-regexp-in-string "snapshot" "-SNAPSHOT"
+					   (string-trim (pkg-info-version-info 'clj-refactor)))))
     (if remove-package-version
         (replace-regexp-in-string " (.*)" "" version)
       version)))
@@ -3323,12 +3323,12 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
 
 (defun cljr--keywordp (s)
   (s-matches-p "^::?[^0-9:[{(\"][^[{(\"]*$"
-               (s-replace "\n" " " s)))
+               (replace-regexp-in-string "\n" " " s)))
 
 (defun cljr--symbolp (s)
   "True when S is a symbol."
   (s-matches-p "^[^0-9:[{(\"][^[{(\"]*$"
-               (s-replace "\n" " " s)))
+               (replace-regexp-in-string "\n" " " s)))
 
 (defun cljr--keyword-lookup-p (s)
   (string-match "^(:\\([^ 0-9:[{(\"][^[{(\"]+\\) " s))

From 11c1d78f39297499870650f0b5f9bbcccfd8c49a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 16:08:21 +0100
Subject: [PATCH 10/31] Replaced s-matches-p

As per https://github.com/clojure-emacs/clj-refactor.el/issues/293
replacing s.el functions with the ones that come as default with Emacs
---
 clj-refactor.el | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 8cfc0bf7..981bb7a7 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -1022,7 +1022,7 @@ word test in it and whether the file lives under the test/ directory."
 (add-hook 'find-file-hook 'cljr--add-ns-if-blank-clj-file)
 
 (defun cljr--dash-in-file-name-p (file-name)
-  (and file-name (s-matches-p "-[^/]+\.clj[sxc]?$" file-name)))
+  (and file-name (string-match-p "-[^/]+\.clj[sxc]?$" file-name)))
 
 (defun cljr--maybe-replace-dash-in-file-name (file-name)
   (if (and (cljr--dash-in-file-name-p file-name)
@@ -1287,7 +1287,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-move-form"
               names (cljr--name-of-defns forms)
               target-ns-alias (when-let ((filtered-require (seq-find
                                                             (lambda (it)
-                                                              (s-matches-p (format target-ns-regexp-template ns) it))
+                                                              (string-match-p (format target-ns-regexp-template ns) it))
                                                             requires)))
                                 (thread-last filtered-require
                                   (s-slice-at ":as")
@@ -1300,7 +1300,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-move-form"
          (cljr--remove-references-of-target-ns forms ns target-ns-alias))
         (when requires
           (cljr--insert-in-ns ":require")
-          (thread-last (seq-remove (lambda (it) (s-matches-p (format target-ns-regexp-template ns) it)) requires)
+          (thread-last (seq-remove (lambda (it) (string-match-p (format target-ns-regexp-template ns) it)) requires)
 	    (apply #'concat)
 	    (string-trim)
 	    (insert))
@@ -1834,7 +1834,7 @@ the alias in the project."
 	       (candidates (gethash (intern short) aliases)))
           (list short candidates)
         (when (and cljr-magic-require-namespaces ; a regex against "" always triggers
-                   (s-matches-p (cljr--magic-requires-re) short))
+                   (string-match-p (cljr--magic-requires-re) short))
           ;; This when-let might seem unnecessary but the regexp match
           ;; isn't perfect.
           (when-let (long (cljr--aget cljr-magic-require-namespaces short))
@@ -1844,7 +1844,7 @@ the alias in the project."
   "Checks if thing at point is keyword without an alias."
   (let ((sym (cider-symbol-at-point)))
     (and (cljr--keywordp sym)
-         (not (s-matches-p "::.+" (cljr--symbol-prefix sym))))))
+         (not (string-match-p "::.+" (cljr--symbol-prefix sym))))))
 
 (defun cljr--in-map-destructuring? ()
   "True when `point' is inside a destructuring form."
@@ -2636,7 +2636,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-clean-ns"
 str/split => str
 split => ''"
   (cond ((cljr--qualified-symbol-p symbol) (car (s-split "/" symbol)))
-        ((s-matches-p "\\w+\\.\\w+" symbol)
+        ((string-match-p "\\w+\\.\\w+" symbol)
 	 (string-join (butlast (s-split "\\." symbol)) "."))
         (t "")))
 
@@ -2688,7 +2688,7 @@ clojure.string/split => split
 str/split => split"
   (let ((name (cljr--normalize-symbol-name symbol)))
     (cond
-     ((s-matches-p "\\w+\\.\\w+" name)
+     ((string-match-p "\\w+\\.\\w+" name)
       (thread-last name (s-split "\\.") last car cljr--symbol-suffix))
      ((cljr--qualified-symbol-p name)
       (thread-last name (s-split "/") cadr cljr--symbol-suffix))
@@ -3322,12 +3322,12 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
     s))
 
 (defun cljr--keywordp (s)
-  (s-matches-p "^::?[^0-9:[{(\"][^[{(\"]*$"
+  (string-match-p "^::?[^0-9:[{(\"][^[{(\"]*$"
                (replace-regexp-in-string "\n" " " s)))
 
 (defun cljr--symbolp (s)
   "True when S is a symbol."
-  (s-matches-p "^[^0-9:[{(\"][^[{(\"]*$"
+  (string-match-p "^[^0-9:[{(\"][^[{(\"]*$"
                (replace-regexp-in-string "\n" " " s)))
 
 (defun cljr--keyword-lookup-p (s)
@@ -3491,7 +3491,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-describe-refacto
     (unless arglists-str
       (error "Couldn't retrieve the parameter list for %s" fn))
     (let* ((arglists-str (substring arglists-str 1 -1)))
-      (unless (s-matches-p "^\\[[^]]+\\]$" arglists-str)
+      (unless (string-match-p "^\\[[^]]+\\]$" arglists-str)
         (error "Can't do work on functions of multiple arities"))
       (s-split " " (substring arglists-str 1 -1)))))
 
@@ -3593,7 +3593,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-describe-refacto
     (view-mode 1)))
 
 (defun cljr--defnp (match)
-  (s-matches-p (rx (seq line-start (* whitespace) "("
+  (string-match-p (rx (seq line-start (* whitespace) "("
                         (? (+ (or (in "a-z") (in "A-z") (in "0-9")
                                   (in "-") (in "._/"))))
                         "defn"))

From 5ca42636332c9fc4eeb8c242f9344970305282ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 20:24:22 +0100
Subject: [PATCH 11/31] cljr--project-dir returns blank string instead of nil

When using cljr--project-dir with the stock Emacs function
string-remove-prefix, like this:

  (string-remove-prefix (cljr--project-dir) path)

instead of s.el's s-chop-prefix:

  (s-chop-prefix (cljr--project-dir) path)

it'll bomb out because cljr--project-dir will return nil, like it does
when running the tests.

But if it returns a blank string, then there is no issue.
---
 clj-refactor.el | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 981bb7a7..9491e0b4 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -761,14 +761,17 @@ A new record is created to define this constructor."
 ;; ------ file -----------
 
 (defun cljr--project-dir ()
-  (or (ignore-errors
-        (file-truename
-         (locate-dominating-file default-directory "project.clj")))
-      (ignore-errors
-        (file-truename
-         (locate-dominating-file default-directory "build.boot")))
-      (ignore-errors (file-truename
-                      (locate-dominating-file default-directory "pom.xml")))))
+  (let ((project-dir (or (ignore-errors
+			   (file-truename
+			    (locate-dominating-file default-directory "project.clj")))
+			 (ignore-errors
+			   (file-truename
+			    (locate-dominating-file default-directory "build.boot")))
+			 (ignore-errors (file-truename
+					 (locate-dominating-file default-directory "pom.xml"))))))
+    (if (null project-dir)
+	""
+      project-dir)))
 
 (defun cljr--project-file ()
   (let ((project-dir (cljr--project-dir)))

From 6d0eaa3a9a85b1d54b792069ecb40145a1fc726c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 18:50:02 +0100
Subject: [PATCH 12/31] Remove s-chop-(pre|suf)fix with
 string-remove-(pre|suf)fix

---
 clj-refactor.el | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 9491e0b4..a95078bb 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -1830,7 +1830,7 @@ the alias in the project."
   (let ((short (thread-last (buffer-substring-no-properties
 			     (cljr--point-after 'paredit-backward)
 			     (1- (point)))
-		 (s-chop-prefix "::"))))
+		 (string-remove-prefix "::"))))
     (unless (or (cljr--resolve-alias short)
                 (cljr--js-alias-p short))
       (if-let ((aliases (ignore-errors (cljr--get-aliases-from-middleware)))
@@ -1896,8 +1896,8 @@ form."
 
 (defun cljr--excluded-from-project-clean-p (filename)
   (member (s-with filename
-            (s-chop-prefix (cljr--project-dir))
-            (s-chop-prefix "/"))
+            (string-remove-prefix (cljr--project-dir))
+            (string-remove-prefix "/"))
           cljr-project-clean-exceptions))
 
 ;;;###autoload
@@ -1948,7 +1948,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-project-clean"
   "Strips metadata and comments"
   (with-temp-buffer
     (let ((names (list)))
-      (insert (thread-last deps (s-chop-prefix "[") (s-chop-suffix "]")))
+      (insert (thread-last deps (string-remove-prefix "[") (string-remove-suffix "]")))
       (goto-char (point-min))
       (while (not (cljr--empty-buffer-p))
         (push (cljr--extract-next-dependency-name) names))
@@ -2026,8 +2026,8 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-sort-project-dep
 						    (cljr--point-after 'paredit-forward))
 	cljr--get-sorted-dependency-names
 	(cljr--sort-dependency-vectors (thread-last (clojure-delete-and-extract-sexp)
-					 (s-chop-prefix "[")
-					 (s-chop-suffix "]")))
+					 (string-remove-prefix "[")
+					 (string-remove-suffix "]")))
 	insert))
     (indent-region (point-min) (point-max))
     (save-buffer)))
@@ -2385,7 +2385,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-promote-function
 (defun cljr--project-relative-path (path)
   "Denormalize PATH to make to make it relative to the project
 root."
-  (s-chop-prefix (cljr--project-dir) path))
+  (string-remove-prefix (cljr--project-dir) path))
 
 (defun cljr--get-valid-filename (hash)
   "Get :file value from the hash table and convert path if necessary."
@@ -2708,17 +2708,17 @@ Date. -> Date
 ~@sym => sym"
   (cond
    ((string-suffix-p "." name)
-    (thread-last name (s-chop-suffix ".") cljr--normalize-symbol-name))
+    (thread-last name (string-remove-suffix ".") cljr--normalize-symbol-name))
    ((string-prefix-p "#'" name)
-    (thread-last name (s-chop-prefix "#'") cljr--normalize-symbol-name))
+    (thread-last name (string-remove-prefix "#'") cljr--normalize-symbol-name))
    ((string-prefix-p "'" name)
-    (thread-last name (s-chop-prefix "'") cljr--normalize-symbol-name))
+    (thread-last name (string-remove-prefix "'") cljr--normalize-symbol-name))
    ((string-prefix-p "~" name)
-    (thread-last name (s-chop-prefix "~") cljr--normalize-symbol-name))
+    (thread-last name (string-remove-prefix "~") cljr--normalize-symbol-name))
    ((string-prefix-p "~@" name)
-    (thread-last name (s-chop-prefix "~@") cljr--normalize-symbol-name))
+    (thread-last name (string-remove-prefix "~@") cljr--normalize-symbol-name))
    ((string-prefix-p "@" name)
-    (thread-last name (s-chop-prefix "@") cljr--normalize-symbol-name))
+    (thread-last name (string-remove-prefix "@") cljr--normalize-symbol-name))
    (t name)))
 
 (defun cljr--call-middleware-to-resolve-missing (symbol)
@@ -3255,7 +3255,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
   (let ((keyfn (cadr args)))
     (cljr--insert-example-fn (cider-symbol-at-point)
                              (if (cljr--keywordp keyfn)
-                                 (list (s-chop-prefix ":" keyfn))
+                                 (list (string-remove-prefix ":" keyfn))
                                (list 0))
                              path)))
 
@@ -3265,7 +3265,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
                            (cider-symbol-at-point))))
     (cljr--insert-example-fn (cider-symbol-at-point)
                              (if (cljr--keywordp last-path-entry)
-                                 (list (s-chop-prefix ":" last-path-entry))
+                                 (list (string-remove-prefix ":" last-path-entry))
                                (list 0))
                              path)))
 
@@ -3286,7 +3286,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
                                   (= 3 (length args))))
          (param-name (if making-comparator?
                          (when (cljr--keywordp (car args))
-                           (s-chop-prefix ":" (car args)))
+                           (string-remove-prefix ":" (car args)))
                        (when-let (coll-name (cljr--guess-param-name (car (last args))))
                          (inflection-singularize-string coll-name)))))
     (cljr--insert-example-fn fn-name
@@ -3374,9 +3374,9 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
      ((and fn-call (string-suffix-p "." fn-call))
       (s-dashed-words (car (last (s-split "\\." fn-call t)))))
      ((and fn-call (string-prefix-p "create-" fn-call))
-      (s-chop-prefix "create-" fn-call))
+      (string-remove-prefix "create-" fn-call))
      ((and fn-call (string-prefix-p ".get" fn-call))
-      (s-dashed-words (s-chop-prefix ".get" fn-call)))
+      (s-dashed-words (string-remove-prefix ".get" fn-call)))
      ((string= "get-in" fn-call)
       (cljr--find-param-name-from-get-in prepped-form))
      ((string= "get" fn-call)
@@ -3428,7 +3428,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
                            (paredit-backward-down)
                            (cider-symbol-at-point))))
     (when (cljr--keywordp last-path-entry)
-      (s-chop-prefix ":" last-path-entry))))
+      (string-remove-prefix ":" last-path-entry))))
 
 (defun cljr--find-param-name-from-get (form)
   (let ((key (cljr--with-string-content form
@@ -3437,7 +3437,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
                (cljr--skip-past-whitespace-and-comments)
                (cljr--extract-sexp))))
     (when (cljr--keywordp key)
-      (s-chop-prefix ":" key))))
+      (string-remove-prefix ":" key))))
 
 (defun cljr--insert-example-fn (name args path)
   "Create a new function from NAME and ARGS.

From 84892b00404da874ef3b56f09f18ec3fa6f53ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 19:04:18 +0100
Subject: [PATCH 13/31] Removed s-(pre|ap)pend

---
 clj-refactor.el | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index a95078bb..c98fa7ca 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -2007,10 +2007,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-project-clean"
     (let ((dividing-line "<===============================>"))
       (cljr--prepare-sort-buffer sorted-names vectors-and-meta dividing-line)
       (cljr--sort-dependency-vectors-with-meta-and-comments dividing-line)
-      (thread-last (buffer-substring-no-properties (point) (point-max))
-	string-trim
-	(s-prepend "[")
-	(s-append "]")))))
+      (concat "[" (string-trim (buffer-substring-no-properties (point) (point-max))) "]"))))
 
 ;;;###autoload
 (defun cljr-sort-project-dependencies ()

From 209bd74efb95b2043b20bd1cacef808c5e944150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 20:39:55 +0100
Subject: [PATCH 14/31] Switch to downcase from s-downcase

As part of this issue:

https://github.com/clojure-emacs/clj-refactor.el/issues/293
---
 clj-refactor.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index c98fa7ca..557232c2 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -2062,8 +2062,8 @@ If it's present KEY indicates the key to extract from the response."
 (splitting the string at numbers and doing numeric compare with them).
 It is optimized for version comparisons, in that empty strings are sorted
 before non-empty. This lets 1.7.0 be sorted above 1.7.0-RC1."
-  (let ((str1-components (cljr--dict-split (s-downcase str1)))
-        (str2-components (cljr--dict-split (s-downcase str2))))
+  (let ((str1-components (cljr--dict-split (downcase str1)))
+        (str2-components (cljr--dict-split (downcase str2))))
     (cljr--dict-lessp str1-components str2-components)))
 
 (defun cljr--dict-lessp (slist1 slist2)
@@ -3089,8 +3089,8 @@ if REMOVE-PACKAGE_VERSION is t get rid of the (package: 20150828.1048) suffix."
   "Check whether clj-refactor and nrepl-refactor versions are the same"
   (let ((refactor-nrepl-version (or (cljr--middleware-version)
                                     "n/a")))
-    (unless (string-equal (s-downcase refactor-nrepl-version)
-			  (s-downcase (cljr--version :remove-package-version)))
+    (unless (string-equal (downcase refactor-nrepl-version)
+			  (downcase (cljr--version :remove-package-version)))
       (cider-repl-emit-interactive-stderr
        (format "WARNING: clj-refactor and refactor-nrepl are out of sync.
 Their versions are %s and %s, respectively.

From a7a983ada59bf8469b05f38c3bd3a4cce0033833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 20:58:45 +0100
Subject: [PATCH 15/31] Remove s-present?

As part of the removal of s.el as per
https://github.com/clojure-emacs/clj-refactor.el/issues/293 using
functions that come as part of Emacs
---
 clj-refactor.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 557232c2..5b91fa24 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -2247,7 +2247,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-update-project-d
               (insert name)
             (mc/create-fake-cursor-at-point)))
         (re-search-forward "\\[")
-        (when (s-present? locals)
+	(when (not (or (null locals) (string= "" locals)))
           (insert locals)
           (unless (looking-at-p "\\]")
             (insert " ")))
@@ -2255,7 +2255,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-update-project-d
         (unless (looking-at "\s*?$")
           (newline))
         (indent-region fn-start (cljr--point-after 'paredit-forward-up)))
-      (when (s-present? locals)
+      (when (not (or (null locals) (string= "" locals)))
         (insert (format "(partial  %s)" locals))
         (backward-char (length (concat " " locals ")"))))
       (if name
@@ -3193,7 +3193,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
 
                          (:else sexp-forms*))))
          (prefix (cljr--symbol-prefix symbol-at-point))
-         (path (when (s-present? prefix)
+         (path (when (not (or (null prefix) (string= "" prefix)))
                  (cljr--ns-path (cljr--resolve-alias prefix)))))
     (push-mark)
     (if (cljr--symbolp symbol-at-point)

From 5a3b3cc6ce44b429ae8c1fdf10e458e69d8bfd3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Tue, 25 Apr 2017 16:59:14 +0100
Subject: [PATCH 16/31] Replaced s-split with split-string

As per https://github.com/clojure-emacs/clj-refactor.el/issues/293
replacing s.el functions with the ones that come as default with Emacs
---
 clj-refactor.el | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 5b91fa24..275d2a90 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -1226,7 +1226,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-stop-referring"
                (str (progn (paredit-forward-up)
                            (paredit-backward-down)
                            (buffer-substring-no-properties beg (point))))
-               (symbols (s-split " " (string-trim str) t)))
+               (symbols (split-string (string-trim str) " " t)))
           (paredit-backward-up)
           (paredit-backward)
           (clojure-delete-and-extract-sexp)
@@ -2525,7 +2525,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-rename-symbol"
         (cljr--warm-ast-cache)))))
 
 (defun cljr--replace-refer-all-with-alias (ns publics-occurrences alias)
-  (let ((ns-last-token (car (last (s-split "\\." ns)))))
+  (let ((ns-last-token (car (last (split-string ns "\\.")))))
     (when (re-search-forward (format "\\(%s\\).*?\\([\]\)]\\)" ns-last-token) nil t)
       (replace-match (format "\\1 :as %s\\2" alias)))
     (perform-replace (format "%s/" alias) "" nil nil t)
@@ -2635,9 +2635,9 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-clean-ns"
   "java.util.Date => java.util
 str/split => str
 split => ''"
-  (cond ((cljr--qualified-symbol-p symbol) (car (s-split "/" symbol)))
+  (cond ((cljr--qualified-symbol-p symbol) (car (split-string symbol "/")))
         ((string-match-p "\\w+\\.\\w+" symbol)
-	 (string-join (butlast (s-split "\\." symbol)) "."))
+	 (string-join (butlast (split-string symbol "\\.")) "."))
         (t "")))
 
 (defun cljr--insert-missing-require (symbol missing-symbol type)
@@ -2689,9 +2689,9 @@ str/split => split"
   (let ((name (cljr--normalize-symbol-name symbol)))
     (cond
      ((string-match-p "\\w+\\.\\w+" name)
-      (thread-last name (s-split "\\.") last car cljr--symbol-suffix))
+      (thread-last name (split-string "\\.") last car cljr--symbol-suffix))
      ((cljr--qualified-symbol-p name)
-      (thread-last name (s-split "/") cadr cljr--symbol-suffix))
+      (thread-first name (split-string "/") cadr cljr--symbol-suffix))
      (t name))))
 
 (defun cljr--normalize-symbol-name (name)
@@ -3026,9 +3026,9 @@ If the symbol is bound locally nil will be returned.
 ALL has the same meaning as for `cider-var-info'"
   (if symbol
       (cider-var-info symbol all)
-    (let ((used-locals (s-split " " (cljr--call-middleware-to-find-used-locals
+    (let ((used-locals (split-string (cljr--call-middleware-to-find-used-locals
                                      (expand-file-name (buffer-file-name))
-                                     (line-number-at-pos) (1+ (current-column)))))
+                                     (line-number-at-pos) (1+ (current-column))) " "))
           (symbol (cider-symbol-at-point)))
       (unless (member symbol used-locals)
         (cider-var-info symbol all)))))
@@ -3369,7 +3369,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
      ((cljr--keyword-lookup-p prepped-form)
       (cljr--strip-keyword-ns (match-string 1 prepped-form)))
      ((and fn-call (string-suffix-p "." fn-call))
-      (s-dashed-words (car (last (s-split "\\." fn-call t)))))
+      (s-dashed-words (car (last (split-string fn-call "\\." t)))))
      ((and fn-call (string-prefix-p "create-" fn-call))
       (string-remove-prefix "create-" fn-call))
      ((and fn-call (string-prefix-p ".get" fn-call))
@@ -3493,7 +3493,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-describe-refacto
     (let* ((arglists-str (substring arglists-str 1 -1)))
       (unless (string-match-p "^\\[[^]]+\\]$" arglists-str)
         (error "Can't do work on functions of multiple arities"))
-      (s-split " " (substring arglists-str 1 -1)))))
+      (split-string (substring arglists-str 1 -1) " "))))
 
 (defvar cljr--change-signature-mode-map
   (let ((keymap (make-sparse-keymap)))

From d3d32231b43bb0219c618199c34eceb780c1c429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Wed, 26 Apr 2017 08:44:12 +0100
Subject: [PATCH 17/31] Replaced s-contains-p

As per https://github.com/clojure-emacs/clj-refactor.el/issues/293
replacing s.el functions with the ones that come as default with Emacs
---
 clj-refactor.el | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 275d2a90..e52cf025 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -2629,7 +2629,12 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-clean-ns"
     (cljr--insert-libspec-verbosely missing)))
 
 (defun cljr--qualified-symbol-p (symbol)
-  (s-contains-p "/" (format "%s" symbol)))
+  (thread-last symbol
+    (format "%s")
+    regexp-quote
+    (string-match-p "/")
+    null
+    not))
 
 (defun cljr--symbol-prefix (symbol)
   "java.util.Date => java.util

From cb3271019c2f76e9eaf85cdb0e3193137add10e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Wed, 26 Apr 2017 11:24:45 +0100
Subject: [PATCH 18/31] Replace s-match

As per https://github.com/clojure-emacs/clj-refactor.el/issues/293
replacing s.el functions with the ones that come as default with Emacs
---
 clj-refactor.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index e52cf025..a5b04fa1 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -3362,7 +3362,8 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
   (list "first" "second" "last" "fnext" "nth" "rand-nth"))
 
 (defun cljr--strip-keyword-ns (s)
-  (car (s-match "[^/]+$" s)))
+  (when (string-match "[^/]+$" s)
+    (substring s (car (match-data)) (car (cdr (match-data))))))
 
 (defun cljr--guess-param-name (form)
   (let* ((prepped-form (cljr--strip-off-semantic-noops

From df7c4f11f01256ad6bb372b009beff8c7b3616aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Thu, 27 Apr 2017 14:40:09 +0100
Subject: [PATCH 19/31] Replace s-dashed-words

As part of the drive to replace the dependency on the functions from
s.el replacing s-dashed-words with function that relies only on
functions that come as part of Emacs release.
---
 clj-refactor.el | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index a5b04fa1..73f28a96 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -41,6 +41,7 @@
 (require 'sgml-mode)
 (require 'inflections)
 (require 'hydra)
+(require 'subword)
 
 (defcustom cljr-add-ns-to-blank-clj-files t
   "If t, automatically add a ns form to new .clj files."
@@ -3365,6 +3366,17 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
   (when (string-match "[^/]+$" s)
     (substring s (car (match-data)) (car (cdr (match-data))))))
 
+(defun cljr--dashed-words (s)
+  "Take the string S and replace all the word separators with '-'
+and make the whole string lower-cased."
+  (with-temp-buffer
+    (insert s)
+    (goto-char (point-min))
+    (while (not (eobp))
+      (subword-forward)
+      (insert " "))
+    (mapconcat 'identity (split-string (downcase (buffer-string))) "-")))
+
 (defun cljr--guess-param-name (form)
   (let* ((prepped-form (cljr--strip-off-semantic-noops
                         (cljr--unwind-s form)))
@@ -3375,11 +3387,11 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
      ((cljr--keyword-lookup-p prepped-form)
       (cljr--strip-keyword-ns (match-string 1 prepped-form)))
      ((and fn-call (string-suffix-p "." fn-call))
-      (s-dashed-words (car (last (split-string fn-call "\\." t)))))
+      (cljr--dashed-words (car (last (split-string fn-call "\\." t)))))
      ((and fn-call (string-prefix-p "create-" fn-call))
       (string-remove-prefix "create-" fn-call))
      ((and fn-call (string-prefix-p ".get" fn-call))
-      (s-dashed-words (string-remove-prefix ".get" fn-call)))
+      (cljr--dashed-words (string-remove-prefix ".get" fn-call)))
      ((string= "get-in" fn-call)
       (cljr--find-param-name-from-get-in prepped-form))
      ((string= "get" fn-call)

From 3504f9e5656c525c317c15b8861a1aaa834ca943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Thu, 27 Apr 2017 18:25:13 +0100
Subject: [PATCH 20/31] Replaced s-with

thread-last seems to be doing the same thing and is part of Emacs'
subr-x.el whereas s-with is part of s.el
---
 clj-refactor.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 73f28a96..5d5821e7 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -1896,7 +1896,7 @@ form."
 ;; ------ project clean --------
 
 (defun cljr--excluded-from-project-clean-p (filename)
-  (member (s-with filename
+  (member (thread-last filename
             (string-remove-prefix (cljr--project-dir))
             (string-remove-prefix "/"))
           cljr-project-clean-exceptions))

From e0c0ac6fd7336e9faf01ea24dc17415583164e20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Thu, 27 Apr 2017 21:13:37 +0100
Subject: [PATCH 21/31] Replace s-slice-at

As part of the attempt to remove the dependency on s.el, replaced
s-slice-at with a simpler/cruder function.
---
 clj-refactor.el | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 5d5821e7..695fea84 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -1260,6 +1260,11 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-stop-referring"
       (goto-char p)
       (cljr--just-one-blank-line))))
 
+(defun cljr--slice-at (pattern s)
+  "Slice S up at every index matching PATTERN"
+  (let ((slices (split-string s pattern)))
+    (cons (car slices) (mapcar (lambda (slice) (concat pattern slice)) (cdr slices)))))
+
 ;;;###autoload
 (defun cljr-move-form ()
   "Move the form containing POINT to a new namespace.
@@ -1294,7 +1299,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-move-form"
                                                               (string-match-p (format target-ns-regexp-template ns) it))
                                                             requires)))
                                 (thread-last filtered-require
-                                  (s-slice-at ":as")
+                                  (cljr--slice-at ":as")
                                   (last)
                                   (car)
                                   (replace-regexp-in-string (format target-ns-alias-template ns) "\\1")

From 315d517efd553937b1ae4301b90903603540acd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Thu, 27 Apr 2017 21:16:36 +0100
Subject: [PATCH 22/31] Less parens

Removed the unnecessary parenthesis within thread-last macros
---
 clj-refactor.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 695fea84..7f6cd572 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -1300,10 +1300,10 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-move-form"
                                                             requires)))
                                 (thread-last filtered-require
                                   (cljr--slice-at ":as")
-                                  (last)
-                                  (car)
+                                  last
+                                  car
                                   (replace-regexp-in-string (format target-ns-alias-template ns) "\\1")
-				  (string-trim))))
+				  string-trim)))
         (goto-char (point-max))
         (cljr--insert-with-proper-whitespace
          (cljr--remove-references-of-target-ns forms ns target-ns-alias))
@@ -1311,8 +1311,8 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-move-form"
           (cljr--insert-in-ns ":require")
           (thread-last (seq-remove (lambda (it) (string-match-p (format target-ns-regexp-template ns) it)) requires)
 	    (apply #'concat)
-	    (string-trim)
-	    (insert))
+	    string-trim
+	    insert)
           (cljr-clean-ns))
         (save-buffer))
       (cljr--update-ns-after-moving-fns ns (nreverse names))

From c1efb08e6f9b3027b044a2fc9fbd60f6b1859d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Thu, 27 Apr 2017 22:19:45 +0100
Subject: [PATCH 23/31] Remove s-lines

Replacing it with split-string, but with the parameter taken from
s-lines
---
 clj-refactor.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 7f6cd572..f9a44ea4 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -2383,7 +2383,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-promote-function
     (cljr--call-middleware-async find-symbol-request callback)))
 
 (defun cljr--first-line (s)
-  (thread-first s s-lines car string-trim))
+  (thread-first s (split-string "\\(\r\n\\|[\n\r]\\)") car string-trim))
 
 (defun cljr--project-relative-path (path)
   "Denormalize PATH to make to make it relative to the project

From 4a10aea3d194513acb23ef6dfce9f15436a2ae6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Thu, 27 Apr 2017 21:20:52 +0100
Subject: [PATCH 24/31] Removed s.el as a dependency

As per the issue
https://github.com/clojure-emacs/clj-refactor.el/issues/293 removed s.el
so that there is one less dependency for this mode that isn't part of
the standard Emacs release.
---
 clj-refactor.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index f9a44ea4..037bc6bd 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -31,7 +31,6 @@
 
 (require 'seq)
 (require 'clj-refactor-compat)
-(require 's)
 (require 'yasnippet)
 (require 'paredit)
 (require 'multiple-cursors-core)

From e8123125b622897b7141310ec66d027be99912ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Mon, 1 May 2017 20:38:21 +0100
Subject: [PATCH 25/31] Created cljr--string-present-p

As part of the extraction of the dependencies on s.el, it was replaced
with Emacs native functions, but then it was deemed that their usage was
not straightforward enough, hence cljr--string-present-p
---
 clj-refactor.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 037bc6bd..e3f0256d 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -2216,6 +2216,9 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-update-project-d
 (defun cljr--highlight-sexp ()
   (cljr--highlight (point) (cljr--point-after 'paredit-forward)))
 
+(defun cljr--string-present-p (s)
+  (not (or (null s) (string-empty-p s))))
+
 (defun cljr--promote-fn ()
   (save-excursion
     (let* ((locals (save-excursion (paredit-forward-down)
@@ -2252,7 +2255,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-update-project-d
               (insert name)
             (mc/create-fake-cursor-at-point)))
         (re-search-forward "\\[")
-	(when (not (or (null locals) (string= "" locals)))
+	(when (cljr--string-present-p locals)
           (insert locals)
           (unless (looking-at-p "\\]")
             (insert " ")))

From 1641730a9cc5fb15016a20982d1bce277c2c3533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Mon, 1 May 2017 23:09:08 +0100
Subject: [PATCH 26/31] Reused cljr--string-present-p

Using it in a few more places
---
 clj-refactor.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index e3f0256d..6203c335 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -2263,7 +2263,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-update-project-d
         (unless (looking-at "\s*?$")
           (newline))
         (indent-region fn-start (cljr--point-after 'paredit-forward-up)))
-      (when (not (or (null locals) (string= "" locals)))
+      (when (cljr--string-present-p locals)
         (insert (format "(partial  %s)" locals))
         (backward-char (length (concat " " locals ")"))))
       (if name
@@ -3206,7 +3206,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
 
                          (:else sexp-forms*))))
          (prefix (cljr--symbol-prefix symbol-at-point))
-         (path (when (not (or (null prefix) (string= "" prefix)))
+         (path (when (cljr--string-present-p prefix)
                  (cljr--ns-path (cljr--resolve-alias prefix)))))
     (push-mark)
     (if (cljr--symbolp symbol-at-point)

From 80d7fd43117c2fe339752b95d392ea855fdcae4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Mon, 1 May 2017 20:43:48 +0100
Subject: [PATCH 27/31] Cleaning up the intent

Onliner instead of if statement
---
 clj-refactor.el | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 6203c335..d18fadba 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -769,9 +769,7 @@ A new record is created to define this constructor."
 			    (locate-dominating-file default-directory "build.boot")))
 			 (ignore-errors (file-truename
 					 (locate-dominating-file default-directory "pom.xml"))))))
-    (if (null project-dir)
-	""
-      project-dir)))
+    (or project-dir "")))
 
 (defun cljr--project-file ()
   (let ((project-dir (cljr--project-dir)))

From 01cf7729dcfad626ec5ebbbe82b70e0cda241791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Mon, 1 May 2017 20:59:15 +0100
Subject: [PATCH 28/31] Fix for the omission with split-string

It should have been a thread first since the switch from s.el's s-split
takes regexp as the first argument and the string as the last. Whereas
split-string takes the arguments the other way around.
---
 clj-refactor.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index d18fadba..02a4d979 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -2700,7 +2700,7 @@ str/split => split"
   (let ((name (cljr--normalize-symbol-name symbol)))
     (cond
      ((string-match-p "\\w+\\.\\w+" name)
-      (thread-last name (split-string "\\.") last car cljr--symbol-suffix))
+      (thread-first name (split-string "\\.") last car cljr--symbol-suffix))
      ((cljr--qualified-symbol-p name)
       (thread-first name (split-string "/") cadr cljr--symbol-suffix))
      (t name))))

From e04912fbe079dc20bb3ce075a0affb499ec4aafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Mon, 1 May 2017 21:06:07 +0100
Subject: [PATCH 29/31] Made cljr--whitespacep null safe

After removing s-blank? from s.el, just using string-blank-p wasn't null
safe.

Added the null check on Benedek Fazekas' prompting.
---
 clj-refactor.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 02a4d979..6be0c95d 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -573,7 +573,7 @@ list of (fn args) to pass to `apply''"
 
 (defun cljr--whitespacep (s)
   "True if S contains only whitespace."
-  (string-blank-p (string-trim s)))
+  (or (null s) (string-blank-p (string-trim s))))
 
 (defun cljr--make-room-for-toplevel-form ()
   (if (cljr--whitespacep (buffer-substring-no-properties (point) (point-max)))

From c02c15f4757cc8a5ea5d30d1bc56833ead6d2077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Mon, 1 May 2017 21:31:13 +0100
Subject: [PATCH 30/31] Let diet

No need for the let clause, removing it
---
 clj-refactor.el | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 6be0c95d..7dcb17b2 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -761,15 +761,15 @@ A new record is created to define this constructor."
 ;; ------ file -----------
 
 (defun cljr--project-dir ()
-  (let ((project-dir (or (ignore-errors
-			   (file-truename
-			    (locate-dominating-file default-directory "project.clj")))
-			 (ignore-errors
-			   (file-truename
-			    (locate-dominating-file default-directory "build.boot")))
-			 (ignore-errors (file-truename
-					 (locate-dominating-file default-directory "pom.xml"))))))
-    (or project-dir "")))
+  (or (ignore-errors
+	(file-truename
+	 (locate-dominating-file default-directory "project.clj")))
+      (ignore-errors
+	(file-truename
+	 (locate-dominating-file default-directory "build.boot")))
+      (ignore-errors (file-truename
+		      (locate-dominating-file default-directory "pom.xml")))
+      ""))
 
 (defun cljr--project-file ()
   (let ((project-dir (cljr--project-dir)))

From c33fc5f46dcd43bd85da66fea5ee8245d54a5c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=20=D0=A1=D0=B8=D0=BC=D0=B8=D1=9B?= <asimic@gmail.com>
Date: Mon, 1 May 2017 23:03:49 +0100
Subject: [PATCH 31/31] Avoiding repetition

Used mapcar in order to avoid the repetition
---
 clj-refactor.el | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/clj-refactor.el b/clj-refactor.el
index 7dcb17b2..fbfae71d 100644
--- a/clj-refactor.el
+++ b/clj-refactor.el
@@ -760,16 +760,18 @@ A new record is created to define this constructor."
 
 ;; ------ file -----------
 
+(defun cljr--locate-project-file (file)
+  (ignore-errors
+    (file-truename
+     (locate-dominating-file default-directory file))))
+
 (defun cljr--project-dir ()
-  (or (ignore-errors
-	(file-truename
-	 (locate-dominating-file default-directory "project.clj")))
-      (ignore-errors
-	(file-truename
-	 (locate-dominating-file default-directory "build.boot")))
-      (ignore-errors (file-truename
-		      (locate-dominating-file default-directory "pom.xml")))
-      ""))
+  (or
+   (thread-last  '("project.clj" "build.boot" "pom.xml")
+     (mapcar 'cljr--locate-project-file)
+     (delete 'nil)
+     car)
+     ""))
 
 (defun cljr--project-file ()
   (let ((project-dir (cljr--project-dir)))