[nongnu] elpa/cider c60598fa4d 5/6: Remove cider-compat.el

[ELPA Syncer]

branch: elpa/cider
commit c60598fa4df6cdd3331c29b8e319cc23de1b7cc6
Author: Bozhidar Batsov <bozhidar@batsov.dev>
Commit: Bozhidar Batsov <bozhidar@batsov.dev>

    Remove cider-compat.el
    
    It's not longer needed now that we don't support Emacs 25.
---
 cider-apropos.el             |  1 -
 cider-browse-ns.el           |  1 -
 cider-browse-spec.el         |  1 -
 cider-classpath.el           |  1 -
 cider-client.el              |  1 -
 cider-clojuredocs.el         |  1 -
 cider-common.el              |  1 -
 cider-compat.el              | 56 --------------------------------------------
 cider-debug.el               |  1 -
 cider-doc.el                 |  1 -
 cider-eldoc.el               |  1 -
 cider-eval.el                |  1 -
 cider-macroexpansion.el      |  1 -
 cider-mode.el                |  1 -
 cider-overlays.el            |  1 -
 cider-popup.el               |  1 -
 cider-repl-history.el        |  1 -
 cider-repl.el                |  1 -
 cider-stacktrace.el          |  1 -
 cider-test.el                |  1 -
 cider-util.el                |  1 -
 cider-xref.el                |  1 -
 cider.el                     |  1 -
 nrepl-client.el              |  1 -
 test/cider-tests--no-auto.el |  1 -
 25 files changed, 80 deletions(-)

diff --git a/cider-apropos.el b/cider-apropos.el
index decbe3526c..121457737e 100644
--- a/cider-apropos.el
+++ b/cider-apropos.el
@@ -29,7 +29,6 @@
 (require 'cider-find) ; for cider--find-var
 (require 'cider-util)
 (require 'subr-x)
-(require 'cider-compat)
 (require 'cider-connection) ; for cider-ensure-connected
 
 (require 'cider-client)
diff --git a/cider-browse-ns.el b/cider-browse-ns.el
index 8f62eeb63d..e6a7557c5d 100644
--- a/cider-browse-ns.el
+++ b/cider-browse-ns.el
@@ -37,7 +37,6 @@
 
 (require 'cider-client)
 (require 'cider-popup)
-(require 'cider-compat)
 (require 'cider-util)
 (require 'nrepl-dict)
 
diff --git a/cider-browse-spec.el b/cider-browse-spec.el
index 7a9e459aef..933ee39ef2 100644
--- a/cider-browse-spec.el
+++ b/cider-browse-spec.el
@@ -35,7 +35,6 @@
 ;;; Code:
 
 (require 'cider-client)
-(require 'cider-compat)
 (require 'cider-popup)
 (require 'cider-util)
 (require 'cl-lib)
diff --git a/cider-classpath.el b/cider-classpath.el
index 6d3e5a1238..ed508b9a14 100644
--- a/cider-classpath.el
+++ b/cider-classpath.el
@@ -26,7 +26,6 @@
 (require 'cider-client)
 (require 'cider-popup)
 (require 'subr-x)
-(require 'cider-compat)
 
 (defvar cider-classpath-buffer "*cider-classpath*")
 
diff --git a/cider-client.el b/cider-client.el
index 8eed2f8d0f..5385a0cf11 100644
--- a/cider-client.el
+++ b/cider-client.el
@@ -33,7 +33,6 @@
 (require 'clojure-mode)
 (require 'spinner)
 
-(require 'cider-compat)
 (require 'cider-connection)
 (require 'cider-common)
 (require 'cider-util)
diff --git a/cider-clojuredocs.el b/cider-clojuredocs.el
index a0fc9c7374..2e900edb95 100644
--- a/cider-clojuredocs.el
+++ b/cider-clojuredocs.el
@@ -28,7 +28,6 @@
 (require 'cider-client)
 (require 'cider-common)
 (require 'subr-x)
-(require 'cider-compat)
 (require 'cider-popup)
 
 (require 'nrepl-dict)
diff --git a/cider-common.el b/cider-common.el
index 03b4759fe1..2ca6bac7e0 100644
--- a/cider-common.el
+++ b/cider-common.el
@@ -25,7 +25,6 @@
 ;;; Code:
 
 (require 'subr-x)
-(require 'cider-compat)
 (require 'nrepl-dict)
 (require 'cider-util)
 (require 'xref)
diff --git a/cider-compat.el b/cider-compat.el
deleted file mode 100644
index 1c63c3c0d5..0000000000
--- a/cider-compat.el
+++ /dev/null
@@ -1,56 +0,0 @@
-;;; cider-compat.el --- Functions from newer Emacs versions for compatibility 
-*- lexical-binding: t -*-
-
-;; Copyright © 2012-2013 Tim King, Phil Hagelberg, Bozhidar Batsov
-;; Copyright © 2013-2021 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:
-
-;; Everything here was copied from subr-x for compatibility with
-;; Emacs 25.1.
-
-;;; Code:
-
-(require 'subr-x)
-
-(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)))))
-
-(provide 'cider-compat)
-;;; cider-compat.el ends here
diff --git a/cider-debug.el b/cider-debug.el
index e513859d60..7aaa0ba046 100644
--- a/cider-debug.el
+++ b/cider-debug.el
@@ -37,7 +37,6 @@
 (require 'cider-inspector)
 (require 'cider-util)
 (require 'cider-common)
-(require 'cider-compat)
 (require 'nrepl-client) ; `nrepl--mark-id-completed'
 (require 'nrepl-dict)
 
diff --git a/cider-doc.el b/cider-doc.el
index 76f13db61b..96d07fd285 100644
--- a/cider-doc.el
+++ b/cider-doc.el
@@ -27,7 +27,6 @@
 
 (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 7e5f20b3dd..4773d9cdc9 100644
--- a/cider-eldoc.el
+++ b/cider-eldoc.el
@@ -34,7 +34,6 @@
 (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-eval.el b/cider-eval.el
index 2e013dec5d..96cb16874e 100644
--- a/cider-eval.el
+++ b/cider-eval.el
@@ -52,7 +52,6 @@
 
 (require 'cider-client)
 (require 'cider-common)
-(require 'cider-compat)
 (require 'cider-jar)
 (require 'cider-overlays)
 (require 'cider-popup)
diff --git a/cider-macroexpansion.el b/cider-macroexpansion.el
index 902cf196a2..e2eabfeb69 100644
--- a/cider-macroexpansion.el
+++ b/cider-macroexpansion.el
@@ -33,7 +33,6 @@
 
 (require 'cider-mode)
 (require 'subr-x)
-(require 'cider-compat)
 
 (defconst cider-macroexpansion-buffer "*cider-macroexpansion*")
 
diff --git a/cider-mode.el b/cider-mode.el
index b96432df83..6dc71efe72 100644
--- a/cider-mode.el
+++ b/cider-mode.el
@@ -42,7 +42,6 @@
 (require 'cider-inspector)
 (require 'cider-find)
 (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 d51273c839..1cc6c3fc45 100644
--- a/cider-overlays.el
+++ b/cider-overlays.el
@@ -27,7 +27,6 @@
 
 (require 'cider-common)
 (require 'subr-x)
-(require 'cider-compat)
 (require 'cl-lib)
 
 
diff --git a/cider-popup.el b/cider-popup.el
index 75f1fa008d..9bc6fee163 100644
--- a/cider-popup.el
+++ b/cider-popup.el
@@ -24,7 +24,6 @@
 ;;; 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 8840a9c2e9..70e9d201d2 100644
--- a/cider-repl-history.el
+++ b/cider-repl-history.el
@@ -30,7 +30,6 @@
 ;;; 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 d114a55248..c58d49f73b 100644
--- a/cider-repl.el
+++ b/cider-repl.el
@@ -48,7 +48,6 @@
 (require 'cider-test)
 (require 'cider-eldoc) ; for cider-eldoc-setup
 (require 'cider-common)
-(require 'cider-compat)
 (require 'cider-util)
 (require 'cider-resolve)
 
diff --git a/cider-stacktrace.el b/cider-stacktrace.el
index e64cb4e6e0..ace59b25e4 100644
--- a/cider-stacktrace.el
+++ b/cider-stacktrace.el
@@ -33,7 +33,6 @@
 (require 'subr-x)
 
 (require 'cider-common)
-(require 'cider-compat)
 (require 'cider-client)
 (require 'cider-popup)
 (require 'cider-util)
diff --git a/cider-test.el b/cider-test.el
index 8d052d779e..d4061736e8 100644
--- a/cider-test.el
+++ b/cider-test.el
@@ -39,7 +39,6 @@
 (require 'cider-client)
 (require 'cider-popup)
 (require 'cider-stacktrace)
-(require 'cider-compat)
 (require 'cider-overlays)
 
 ;;; Variables
diff --git a/cider-util.el b/cider-util.el
index 03b6df0fca..e8625c4075 100644
--- a/cider-util.el
+++ b/cider-util.el
@@ -39,7 +39,6 @@
 (require 'thingatpt)
 
 ;; clojure-mode and CIDER
-(require 'cider-compat)
 (require 'clojure-mode)
 
 (defalias 'cider-pop-back 'pop-tag-mark)
diff --git a/cider-xref.el b/cider-xref.el
index 037e80360e..6a48ccc275 100644
--- a/cider-xref.el
+++ b/cider-xref.el
@@ -32,7 +32,6 @@
 (require 'cider-find)
 (require 'cider-util)
 (require 'subr-x)
-(require 'cider-compat)
 
 (require 'cider-client)
 (require 'cider-popup)
diff --git a/cider.el b/cider.el
index 8ff87a7ac5..d4ea7de8eb 100644
--- a/cider.el
+++ b/cider.el
@@ -83,7 +83,6 @@
 (require 'cider-connection)
 (require 'cider-mode)
 (require 'cider-common)
-(require 'cider-compat)
 (require 'cider-debug)
 (require 'cider-util)
 
diff --git a/nrepl-client.el b/nrepl-client.el
index dacbe7f360..26308d3076 100644
--- a/nrepl-client.el
+++ b/nrepl-client.el
@@ -71,7 +71,6 @@
 ;;; 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 121c7ceb66..5059782413 100644
--- a/test/cider-tests--no-auto.el
+++ b/test/cider-tests--no-auto.el
@@ -33,7 +33,6 @@
 (require 'buttercup)
 (require 'cider)
 (require 'subr-x)
-(require 'cider-compat)
 
 ;;; Docs
 ;; Presenting docs erroneously would cause an ugly scene.