Trim cider-compat.el down to just if-let* and when-let*

1 files changed, 2 insertions, 133 deletions

diff --git a/cider-compat.el b/cider-compat.el
index ec928dfd..e6b64b28 100644
--- a/cider-compat.el
+++ b/cider-compat.el
@@ -21,110 +21,13 @@
 
 ;;; Commentary:
 
-;; Pretty much everything here's copied from subr-x for compatibility with
-;; Emacs 24.4.
+;; Everything here was copied from subr-x for compatibility with
+;; Emacs 25.1.
 
 ;;; Code:
 
 (eval-and-compile
 
-  (unless (fboundp 'internal--thread-argument)
-    (defmacro internal--thread-argument (first? &rest forms)
-      "Internal implementation for `thread-first' and `thread-last'.
-When Argument FIRST? is non-nil argument is threaded first, else
-last.  FORMS are the expressions to be threaded."
-      (pcase forms
-        (`(,x (,f . ,args) . ,rest)
-         `(internal--thread-argument
-           ,first? ,(if first? `(,f ,x ,@args) `(,f ,@args ,x)) ,@rest))
-        (`(,x ,f . ,rest) `(internal--thread-argument ,first? (,f ,x) ,@rest))
-        (_ (car forms)))))
-
-  (unless (fboundp 'thread-first)
-    (defmacro thread-first (&rest forms)
-      "Thread FORMS elements as the first argument of their successor.
-Example:
-    (thread-first
-      5
-      (+ 20)
-      (/ 25)
-      -
-      (+ 40))
-Is equivalent to:
-    (+ (- (/ (+ 5 20) 25)) 40)
-Note how the single `-' got converted into a list before
-threading."
-      (declare (indent 1)
-               (debug (form &rest [&or symbolp (sexp &rest form)])))
-      `(internal--thread-argument t ,@forms)))
-
-  (unless (fboundp 'thread-last)
-    (defmacro thread-last (&rest forms)
-      "Thread FORMS elements as the last argument of their successor.
-Example:
-    (thread-last
-      5
-      (+ 20)
-      (/ 25)
-      -
-      (+ 40))
-Is equivalent to:
-    (+ 40 (- (/ 25 (+ 20 5))))
-Note how the single `-' got converted into a list before
-threading."
-      (declare (indent 1) (debug thread-first))
-      `(internal--thread-argument nil ,@forms))))
-
-
-(eval-and-compile
-
-  (unless (fboundp 'internal--listify)
-
-    (defsubst internal--listify (elt)
-      "Wrap ELT in a list if it is not one."
-      (if (not (listp elt))
-          (list elt)
-        elt)))
-
-  (unless (fboundp 'internal--check-binding)
-
-    (defsubst internal--check-binding (binding)
-      "Check BINDING is properly formed."
-      (when (> (length binding) 2)
-        (signal
-         'error
-         (cons "`let' bindings can have only one value-form" binding)))
-      binding))
-
-  (unless (fboundp 'internal--build-binding-value-form)
-
-    (defsubst internal--build-binding-value-form (binding prev-var)
-      "Build the conditional value form for BINDING using PREV-VAR."
-      `(,(car binding) (and ,prev-var ,(cadr binding)))))
-
-  (unless (fboundp 'internal--build-binding)
-
-    (defun internal--build-binding (binding prev-var)
-      "Check and build a single BINDING with PREV-VAR."
-      (thread-first
-          binding
-        internal--listify
-        internal--check-binding
-        (internal--build-binding-value-form prev-var))))
-
-  (unless (fboundp 'internal--build-bindings)
-
-    (defun internal--build-bindings (bindings)
-      "Check and build conditional value forms for BINDINGS."
-      (let ((prev-var t))
-        (mapcar (lambda (binding)
-                  (let ((binding (internal--build-binding binding prev-var)))
-                    (setq prev-var (car binding))
-                    binding))
-                bindings)))))
-
-(eval-and-compile
-
   (unless (fboundp 'if-let*)
     (defmacro if-let* (bindings then &rest else)
       "Process BINDINGS and if all values are non-nil eval THEN, else ELSE.
@@ -147,39 +50,5 @@ evalled to set symbol's value."
       (declare (indent 1) (debug if-let*))
       `(if-let* ,bindings ,(macroexp-progn body)))))
 
-(eval-and-compile
-
-  (with-no-warnings
-    (unless (fboundp 'directory-files-recursively)
-      (defun directory-files-recursively (dir regexp &optional include-directories)
-        "Return list of all files under DIR that have file names matching REGEXP.
-This function works recursively.  Files are returned in \"depth first\"
-order, and files from each directory are sorted in alphabetical order.
-Each file name appears in the returned list in its absolute form.
-Optional argument INCLUDE-DIRECTORIES non-nil means also include in the
-output directories whose names match REGEXP."
-        (let ((result nil)
-              (files nil)
-              ;; When DIR is "/", remote file names like "/method:" could
-              ;; also be offered.  We shall suppress them.
-              (tramp-mode (and tramp-mode (file-remote-p (expand-file-name dir)))))
-          (dolist (file (sort (file-name-all-completions "" dir)
-                              'string<))
-            (unless (member file '("./" "../"))
-              (if (directory-name-p file)
-                  (let* ((leaf (substring file 0 (1- (length file))))
-                         (full-file (expand-file-name leaf dir)))
-                    ;; Don't follow symlinks to other directories.
-                    (unless (file-symlink-p full-file)
-                      (setq result
-                            (nconc result (directory-files-recursively
-                                           full-file regexp include-directories))))
-                    (when (and include-directories
-                               (string-match regexp leaf))
-                      (setq result (nconc result (list full-file)))))
-                (when (string-match regexp file)
-                  (push (expand-file-name file dir) files)))))
-          (nconc result (nreverse files)))))))
-
 (provide 'cider-compat)
 ;;; cider-compat.el ends here