Add no-error optional argument to nrepl-current-connection-buffer

Author: vspinu

cider-client.el

@@ -121,9 +121,8 @@ NS specifies the namespace in which to evaluate the request."
 
 (defun cider-current-repl-buffer ()
   "The current REPL buffer."
-  (when (nrepl-current-connection-buffer)
-    (buffer-local-value 'nrepl-repl-buffer
-                        (get-buffer (nrepl-current-connection-buffer)))))
+  (-when-let (repl-buf (nrepl-current-connection-buffer 'no-error))
+    (buffer-local-value 'nrepl-repl-buffer (get-buffer repl-buf))))
 
 (defun cider--var-choice (var-info)
   "Prompt to choose from among multiple VAR-INFO candidates, if required.

cider-interaction.el

@@ -1400,9 +1400,7 @@ Useful in hooks."
 
 (defun cider-connected-p ()
   "Return t if CIDER is currently connected, nil otherwise."
-  (condition-case nil
-      (nrepl-current-connection-buffer)
-    (error nil)))
+  (nrepl-current-connection-buffer 'no-error))
 
 (defun cider-ensure-connected ()
   "Ensure there is a cider connection present, otherwise

cider-repl.el

@@ -158,7 +158,7 @@ joined together.")
 (defun cider-repl-buffer-name (&optional project-dir host port)
   "Generate a REPL buffer name based on current connection buffer.
 PROJECT-DIR, PORT and HOST are as in `nrepl-make-buffer-name'."
-  (with-current-buffer (or (get-buffer (nrepl-current-connection-buffer))
+  (with-current-buffer (or (nrepl-current-connection-buffer 'no-error)
                            (current-buffer))
     (nrepl-make-buffer-name nrepl-repl-buffer-name-template project-dir host port)))
 

nrepl-client.el

@@ -1061,12 +1061,15 @@ PROJECT-DIR, HOST and PORT are as in `nrepl-make-buffer-name'."
       (setq-local kill-buffer-query-functions nil))
     buffer))
 
-(defun nrepl-current-connection-buffer ()
-  "The connection to use for nREPL interaction."
+(defun nrepl-current-connection-buffer (&optional no-error)
+  "The connection to use for nREPL interaction.
+When NO-ERROR is non-nil, don't throw an error when no connection has been
+found."
   (or nrepl-connection-dispatch
       nrepl-connection-buffer
       (car (nrepl-connection-buffers))
-      (error "No nREPL connection buffer")))
+      (unless no-error
+        (error "No nREPL connection buffer"))))
 
 (defun nrepl-connection-buffers ()
   "Return the connection list.