summaryrefslogtreecommitdiff
path: root/cider.el
diff options
context:
space:
mode:
authorBozhidar Batsov <bozhidar@batsov.com>2015-11-19 17:24:13 +0200
committerBozhidar Batsov <bozhidar@batsov.com>2015-11-19 17:24:13 +0200
commitd7defbe1205f89363702d567c2e01419b1fec4e1 (patch)
tree22e8fdbc2e99aa2ea4560a9486a2f86619aa6715 /cider.el
parentff543170e69839978566788c7ec3ddb10e22b8c3 (diff)
Revert "Fix reference to unbound variable"
This reverts commit 1b7ace7b973dae3d054f84de72c6016b9112db21. After a bit of testing it turned out the original code was working fine. Details here https://github.com/clojure-emacs/cider/pull/1426#issuecomment-158086914.
Diffstat (limited to 'cider.el')
-rw-r--r--cider.el30
1 files changed, 15 insertions, 15 deletions
diff --git a/cider.el b/cider.el
index 16d01766..da6c2eef 100644
--- a/cider.el
+++ b/cider.el
@@ -252,22 +252,22 @@ and has no process, return it. If the process is alive, ask the user for
confirmation and return 'new/nil for y/n answer respectively. If other
REPL buffers with dead process exist, ask the user if any of those should
be reused."
- (let ((repl-buffers (cider-repl-buffers)))
- (if-let ((exact-buff (seq-find
- (lambda (buff)
- (with-current-buffer buff
- (or (and endpoint
- (equal endpoint nrepl-endpoint))
- (and project-directory
- (equal project-directory nrepl-project-dir)))))
- repl-buffers)))
- (if (get-buffer-process exact-buff)
- (when (y-or-n-p (format "REPL buffer already exists (%s). \
+ (if-let ((repl-buffers (cider-repl-buffers))
+ (exact-buff (seq-find
+ (lambda (buff)
+ (with-current-buffer buff
+ (or (and endpoint
+ (equal endpoint nrepl-endpoint))
+ (and project-directory
+ (equal project-directory nrepl-project-dir)))))
+ repl-buffers)))
+ (if (get-buffer-process exact-buff)
+ (when (y-or-n-p (format "REPL buffer already exists (%s). \
Do you really want to create a new one? "
- exact-buff))
- 'new)
- exact-buff)
- (or (cider--select-zombie-buffer repl-buffers) 'new))))
+ exact-buff))
+ 'new)
+ exact-buff)
+ (or (cider--select-zombie-buffer repl-buffers) 'new)))
;;;###autoload
(defun cider-jack-in (&optional prompt-project cljs-too)