summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBozhidar Batsov <bozhidar@batsov.com>2018-06-18 09:29:42 +0300
committerBozhidar Batsov <bozhidar@batsov.com>2018-06-18 09:29:42 +0300
commita59fa09c7776fdbe5ae5501088d8c12ce5afbae9 (patch)
tree0fd259a3f37a80ecdc7cddb7fb716f627b159777
parent6981c3125fdd4173fecbc652d44ae9d0562cfbe6 (diff)
Revert "Remove cider-compat.el"
This reverts commit b28fbac964907172fdedc3bea56eab905d5fbdbf. This can't be fully removed due to the difference in the signature of `if-let*` and `when-let*` in Emacs 25 and 26.
-rw-r--r--cider-apropos.el1
-rw-r--r--cider-browse-ns.el1
-rw-r--r--cider-browse-spec.el1
-rw-r--r--cider-classpath.el1
-rw-r--r--cider-client.el1
-rw-r--r--cider-common.el1
-rw-r--r--cider-compat.el185
-rw-r--r--cider-debug.el1
-rw-r--r--cider-doc.el1
-rw-r--r--cider-eldoc.el1
-rw-r--r--cider-grimoire.el1
-rw-r--r--cider-interaction.el3
-rw-r--r--cider-macroexpansion.el1
-rw-r--r--cider-mode.el1
-rw-r--r--cider-overlays.el1
-rw-r--r--cider-popup.el1
-rw-r--r--cider-repl-history.el1
-rw-r--r--cider-repl.el1
-rw-r--r--cider-stacktrace.el1
-rw-r--r--cider-test.el3
-rw-r--r--cider-util.el1
-rw-r--r--cider.el1
-rw-r--r--nrepl-client.el1
-rw-r--r--test/cider-tests--no-auto.el1
24 files changed, 210 insertions, 2 deletions
diff --git a/cider-apropos.el b/cider-apropos.el
index 49433b48..7d577767 100644
--- a/cider-apropos.el
+++ b/cider-apropos.el
@@ -28,6 +28,7 @@
(require 'cider-doc)
(require 'cider-util)
(require 'subr-x)
+(require 'cider-compat)
(require 'cider-client)
(require 'cider-popup)
diff --git a/cider-browse-ns.el b/cider-browse-ns.el
index 67e3bee8..f6a93fce 100644
--- a/cider-browse-ns.el
+++ b/cider-browse-ns.el
@@ -38,6 +38,7 @@
(require 'cider-interaction)
(require 'cider-client)
(require 'subr-x)
+(require 'cider-compat)
(require 'cider-util)
(require 'nrepl-dict)
(require 'easymenu)
diff --git a/cider-browse-spec.el b/cider-browse-spec.el
index b3aa64a7..b88ca300 100644
--- a/cider-browse-spec.el
+++ b/cider-browse-spec.el
@@ -35,6 +35,7 @@
;;; Code:
(require 'cider-client)
+(require 'cider-compat)
(require 'cider-util)
(require 'cl-lib)
(require 'nrepl-dict)
diff --git a/cider-classpath.el b/cider-classpath.el
index 6cf895de..85223237 100644
--- a/cider-classpath.el
+++ b/cider-classpath.el
@@ -26,6 +26,7 @@
(require 'cider-client)
(require 'cider-popup)
(require 'subr-x)
+(require 'cider-compat)
(defvar cider-classpath-buffer "*cider-classpath*")
(add-to-list 'cider-ancillary-buffers cider-classpath-buffer)
diff --git a/cider-client.el b/cider-client.el
index 6c80336b..c0e1aa1d 100644
--- a/cider-client.el
+++ b/cider-client.el
@@ -33,6 +33,7 @@
(require 'clojure-mode)
(require 'subr-x)
+(require 'cider-compat)
(require 'seq)
diff --git a/cider-common.el b/cider-common.el
index c7008d7b..657bd822 100644
--- a/cider-common.el
+++ b/cider-common.el
@@ -25,6 +25,7 @@
;;; Code:
(require 'subr-x)
+(require 'cider-compat)
(require 'nrepl-dict)
(require 'cider-util)
(require 'tramp)
diff --git a/cider-compat.el b/cider-compat.el
new file mode 100644
index 00000000..ec928dfd
--- /dev/null
+++ b/cider-compat.el
@@ -0,0 +1,185 @@
+;;; cider-compat.el --- Functions from newer Emacs versions for compatibility -*- lexical-binding: t -*-
+
+;; Copyright © 2012-2013 Tim King, Phil Hagelberg, Bozhidar Batsov
+;; Copyright © 2013-2018 Bozhidar Batsov, Artur Malabarba and CIDER contributors
+;;
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Pretty much everything here's copied from subr-x for compatibility with
+;; Emacs 24.4.
+
+;;; 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.
+Argument BINDINGS is a list of tuples whose car is a symbol to be
+bound and (optionally) used in THEN, and its cadr is a sexp to be
+evalled to set symbol's value."
+ (declare (indent 2)
+ (debug ([&or (&rest (symbolp form)) (symbolp form)] form body)))
+ `(let* ,(internal--build-bindings bindings)
+ (if ,(car (internal--listify (car (last bindings))))
+ ,then
+ ,@else))))
+
+ (unless (fboundp 'when-let*)
+ (defmacro when-let* (bindings &rest body)
+ "Process BINDINGS and if all values are non-nil eval BODY.
+Argument BINDINGS is a list of tuples whose car is a symbol to be
+bound and (optionally) used in BODY, and its cadr is a sexp to be
+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
diff --git a/cider-debug.el b/cider-debug.el
index 1497b663..d04db695 100644
--- a/cider-debug.el
+++ b/cider-debug.el
@@ -34,6 +34,7 @@
(require 'cider-browse-ns)
(require 'cider-common)
(require 'subr-x)
+(require 'cider-compat)
(require 'seq)
(require 'spinner)
diff --git a/cider-doc.el b/cider-doc.el
index b0133ec5..3a00e385 100644
--- a/cider-doc.el
+++ b/cider-doc.el
@@ -27,6 +27,7 @@
(require 'cider-common)
(require 'subr-x)
+(require 'cider-compat)
(require 'cider-util)
(require 'cider-popup)
(require 'cider-client)
diff --git a/cider-eldoc.el b/cider-eldoc.el
index 29468b98..b055824d 100644
--- a/cider-eldoc.el
+++ b/cider-eldoc.el
@@ -34,6 +34,7 @@
(require 'cider-client)
(require 'cider-common) ; for cider-symbol-at-point
(require 'subr-x)
+(require 'cider-compat)
(require 'cider-util)
(require 'nrepl-dict)
diff --git a/cider-grimoire.el b/cider-grimoire.el
index 0f72a475..c07614ba 100644
--- a/cider-grimoire.el
+++ b/cider-grimoire.el
@@ -28,6 +28,7 @@
(require 'cider-client)
(require 'cider-common)
(require 'subr-x)
+(require 'cider-compat)
(require 'cider-popup)
(require 'nrepl-dict)
diff --git a/cider-interaction.el b/cider-interaction.el
index 92f3ffd4..bef708cb 100644
--- a/cider-interaction.el
+++ b/cider-interaction.el
@@ -41,6 +41,8 @@
(require 'cider-doc)
(require 'cider-eldoc)
(require 'cider-overlays)
+(require 'subr-x)
+(require 'cider-compat)
(require 'clojure-mode)
(require 'thingatpt)
@@ -50,7 +52,6 @@
(require 'compile)
(require 'etags) ; for find-tags-marker-ring
(require 'tramp)
-(require 'subr-x)
(defconst cider-read-eval-buffer "*cider-read-eval*")
(defconst cider-result-buffer "*cider-result*")
diff --git a/cider-macroexpansion.el b/cider-macroexpansion.el
index 83d46d14..e0d42d7d 100644
--- a/cider-macroexpansion.el
+++ b/cider-macroexpansion.el
@@ -33,6 +33,7 @@
(require 'cider-mode)
(require 'subr-x)
+(require 'cider-compat)
(defconst cider-macroexpansion-buffer "*cider-macroexpansion*")
(add-to-list 'cider-ancillary-buffers cider-macroexpansion-buffer)
diff --git a/cider-mode.el b/cider-mode.el
index 4040d49a..93a2a191 100644
--- a/cider-mode.el
+++ b/cider-mode.el
@@ -39,6 +39,7 @@
(require 'cider-resolve)
(require 'cider-doc)
(require 'subr-x)
+(require 'cider-compat)
(defcustom cider-mode-line-show-connection t
"If the mode-line lighter should detail the connection."
diff --git a/cider-overlays.el b/cider-overlays.el
index 3765c651..1a92b35f 100644
--- a/cider-overlays.el
+++ b/cider-overlays.el
@@ -27,6 +27,7 @@
(require 'cider-common)
(require 'subr-x)
+(require 'cider-compat)
(require 'cl-lib)
diff --git a/cider-popup.el b/cider-popup.el
index 662434c0..411acebe 100644
--- a/cider-popup.el
+++ b/cider-popup.el
@@ -24,6 +24,7 @@
;;; Code:
(require 'subr-x)
+(require 'cider-compat)
(define-minor-mode cider-popup-buffer-mode
"Mode for CIDER popup buffers"
diff --git a/cider-repl-history.el b/cider-repl-history.el
index 44e7817f..5e0d5ccd 100644
--- a/cider-repl-history.el
+++ b/cider-repl-history.el
@@ -30,6 +30,7 @@
;;; Code:
(require 'cl-lib)
+(require 'cider-compat)
(require 'cider-popup)
(require 'clojure-mode)
(require 'derived)
diff --git a/cider-repl.el b/cider-repl.el
index 8341231a..fefd10af 100644
--- a/cider-repl.el
+++ b/cider-repl.el
@@ -39,6 +39,7 @@
(require 'cider-eldoc) ; for cider-eldoc-setup
(require 'cider-common)
(require 'subr-x)
+(require 'cider-compat)
(require 'cider-util)
(require 'cider-resolve)
diff --git a/cider-stacktrace.el b/cider-stacktrace.el
index 1f85d30a..929f54b3 100644
--- a/cider-stacktrace.el
+++ b/cider-stacktrace.el
@@ -31,6 +31,7 @@
(require 'easymenu)
(require 'cider-common)
(require 'subr-x)
+(require 'cider-compat)
(require 'cider-client)
(require 'cider-util)
diff --git a/cider-test.el b/cider-test.el
index ab06d6c2..1d70ef88 100644
--- a/cider-test.el
+++ b/cider-test.el
@@ -32,13 +32,14 @@
(require 'cider-client)
(require 'cider-popup)
(require 'cider-stacktrace)
+(require 'subr-x)
+(require 'cider-compat)
(require 'cider-overlays)
(require 'button)
(require 'cl-lib)
(require 'easymenu)
(require 'seq)
-(require 'subr-x)
;;; Variables
diff --git a/cider-util.el b/cider-util.el
index 41266392..6ad2acd3 100644
--- a/cider-util.el
+++ b/cider-util.el
@@ -38,6 +38,7 @@
(require 'subr-x)
;; clojure-mode and CIDER
+(require 'cider-compat)
(require 'clojure-mode)
(require 'nrepl-dict)
diff --git a/cider.el b/cider.el
index 929322a9..da91820b 100644
--- a/cider.el
+++ b/cider.el
@@ -77,6 +77,7 @@
(require 'cider-connection)
(require 'cider-mode)
(require 'cider-common)
+(require 'cider-compat)
(require 'cider-debug)
(require 'tramp-sh)
diff --git a/nrepl-client.el b/nrepl-client.el
index b446519b..4575d8d6 100644
--- a/nrepl-client.el
+++ b/nrepl-client.el
@@ -71,6 +71,7 @@
;;; Code:
(require 'seq)
(require 'subr-x)
+(require 'cider-compat)
(require 'cl-lib)
(require 'nrepl-dict)
(require 'queue)
diff --git a/test/cider-tests--no-auto.el b/test/cider-tests--no-auto.el
index cf7bd739..c27bd50b 100644
--- a/test/cider-tests--no-auto.el
+++ b/test/cider-tests--no-auto.el
@@ -33,6 +33,7 @@
(require 'buttercup)
(require 'cider)
(require 'subr-x)
+(require 'cider-compat)
;;; Docs
;; Presenting docs erroneously would cause an ugly scene.