summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBozhidar Batsov <bozhidar@batsov.com>2016-05-28 19:09:46 +0300
committerBozhidar Batsov <bozhidar@batsov.com>2016-05-28 19:09:46 +0300
commitb939d079c7c922c9be4f6a5fc79aba551a118f45 (patch)
tree640ad635b3790e24fc832f94a9e5f13730578184
parent62276b2aab3fc40a2bb3500b162d0a55ca4ec0aa (diff)
Polish a bit the preceding changes
-rw-r--r--CHANGELOG.md2
-rw-r--r--nrepl-client.el4
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48978f79..575ecd0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
### New Features
-* Add an option `nrepl-prompt-to-kill-server-buffer-on-quit` to control whether killing nrepl server and buffer requires a confirmation prompt.
+* Add an option `nrepl-prompt-to-kill-server-buffer-on-quit` to control whether killing nREPL server buffer and process requires a confirmation prompt.
* [#1672](https://github.com/clojure-emacs/cider/issues/1672): Allow setting a preferred build tool when multiple are found via `cider-preferred-build-tool`.
* Ensure Clojure version meets minimum supported by CIDER (1.7.0).
* Fringe indicators highlight which sexps have been loaded. Disable it with `cider-use-fringe-indicators`.
diff --git a/nrepl-client.el b/nrepl-client.el
index 9d384b72..858459fd 100644
--- a/nrepl-client.el
+++ b/nrepl-client.el
@@ -127,7 +127,7 @@ When true some special buffers like the server buffer will be hidden."
:group 'nrepl)
(defcustom nrepl-prompt-to-kill-server-buffer-on-quit t
- "If non-nil, prompt the user for confirmation before killing the nrepl server buffer and associated process."
+ "If non-nil, prompt the user for confirmation before killing the nrepl server buffer and associated process."
:type 'boolean
:group 'nrepl)
@@ -600,7 +600,7 @@ Do nothing if there is a REPL connected to that server."
;; Don't kill the server if there is a REPL connected to it.
(when (and (not nrepl-client-buffers)
(or (not nrepl-prompt-to-kill-server-buffer-on-quit)
- (y-or-n-p "Also kill server process and buffer? ")))
+ (y-or-n-p "Also kill server process and buffer? ")))
(let ((proc (get-buffer-process server-buf)))
(when (process-live-p proc)
(set-process-query-on-exit-flag proc nil)