Remove clojure-enable-cider and clojure-disable-cider

Author: bbatsov

CHANGELOG.md

@@ -75,6 +75,7 @@ On by default, when `nil` don't automatically enable `cider-mode` in all Clojure
 to avoid conflicts with <kbd>C-g</kbd>.
 * [#1088](https://github.com/clojure-emacs/cider/issues/1088): Kill the
 source-tracking evaluation hack as it wasn't compatible with ClojureScript.
+* Removed `clojure-enable-cider` and `clojure-disable-cider`.
 
 ### Bugs fixed
 

cider-interaction.el

@@ -1748,17 +1748,6 @@ If invoked with a prefix ARG eval the expression after inserting it."
   (interactive)
   (message (read (nrepl-dict-get (nrepl-sync-request:eval "\"PONG\"") "value"))))
 
-(defun clojure-enable-cider ()
-  "Turn on CIDER mode (see command `cider-mode').
-Useful in hooks."
-  (cider-mode 1)
-  (setq next-error-function #'cider-jump-to-compilation-error))
-
-(defun clojure-disable-cider ()
-  "Turn off CIDER mode (see command `cider-mode').
-Useful in hooks."
-  (cider-mode -1))
-
 (defun cider-connected-p ()
   "Return t if CIDER is currently connected, nil otherwise."
   (nrepl-current-connection-buffer 'no-error))
@@ -1773,18 +1762,18 @@ an error is signaled."
   "Enable CIDER's minor mode on existing Clojure buffers.
 See command `cider-mode'."
   (interactive)
-  (add-hook 'clojure-mode-hook #'clojure-enable-cider)
+  (add-hook 'clojure-mode-hook #'cider-mode)
   (dolist (buffer (cider-util--clojure-buffers))
     (with-current-buffer buffer
-      (clojure-enable-cider))))
+      (cider-mode +1))))
 
 (defun cider-disable-on-existing-clojure-buffers ()
   "Disable `cider-mode' on existing Clojure buffers.
 See command `cider-mode'."
   (interactive)
   (dolist (buffer (cider-util--clojure-buffers))
     (with-current-buffer buffer
-      (clojure-disable-cider))))
+      (cider-mode -1))))
 
 (defun cider-possibly-disable-on-existing-clojure-buffers ()
   "If not connected, disable `cider-mode' on existing Clojure buffers."

cider-macroexpansion.el

@@ -167,7 +167,7 @@ and point is placed after the expanded form."
   "Create a new macroexpansion buffer."
   (with-current-buffer (cider-popup-buffer cider-macroexpansion-buffer t)
     (clojure-mode)
-    (clojure-disable-cider)
+    (cider-mode -1)
     (cider-macroexpansion-mode 1)
     (current-buffer)))
 

cider-mode.el

@@ -175,7 +175,8 @@ entirely."
   (cider-eldoc-setup)
   (make-local-variable 'completion-at-point-functions)
   (add-to-list 'completion-at-point-functions
-               #'cider-complete-at-point))
+               #'cider-complete-at-point)
+  (setq next-error-function #'cider-jump-to-compilation-error))
 
 (provide 'cider-mode)