aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-10-26 14:26:18 +0000
committerJuanma Barranquero2007-10-26 14:26:18 +0000
commit6daab4eda7662e373f902108d553b6364982a75d (patch)
treefc84695e00218290949513166b10a633e5233d8a
parente298936f89a49df91563ed0fb6c3d0a91689f08c (diff)
downloademacs-6daab4eda7662e373f902108d553b6364982a75d.tar.gz
emacs-6daab4eda7662e373f902108d553b6364982a75d.zip
(kill-emacs-query-functions): Doc fix; `save-buffers-kill-emacs'
is no longer bound to a key.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/files.el5
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71525cbe8bf..697789e7e17 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-10-26 Juanma Barranquero <lekktu@gmail.com>
2
3 * files.el (kill-emacs-query-functions): Doc fix;
4 `save-buffers-kill-emacs' is no longer bound to a key.
5
12007-10-26 Richard Stallman <rms@gnu.org> 62007-10-26 Richard Stallman <rms@gnu.org>
2 7
3 * isearch-multi.el (isearch-buffers-multi): New option. 8 * isearch-multi.el (isearch-buffers-multi): New option.
diff --git a/lisp/files.el b/lisp/files.el
index b2af5c20414..6b0bd26efe8 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5286,9 +5286,8 @@ message to that effect instead of signaling an error."
5286(defvar kill-emacs-query-functions nil 5286(defvar kill-emacs-query-functions nil
5287 "Functions to call with no arguments to query about killing Emacs. 5287 "Functions to call with no arguments to query about killing Emacs.
5288If any of these functions returns nil, killing Emacs is cancelled. 5288If any of these functions returns nil, killing Emacs is cancelled.
5289`save-buffers-kill-emacs' (\\[save-buffers-kill-emacs]) calls these functions, 5289`save-buffers-kill-emacs' calls these functions, but `kill-emacs',
5290but `kill-emacs', the low level primitive, does not. 5290the low level primitive, does not. See also `kill-emacs-hook'.")
5291See also `kill-emacs-hook'.")
5292 5291
5293(defcustom confirm-kill-emacs nil 5292(defcustom confirm-kill-emacs nil
5294 "How to ask for confirmation when leaving Emacs. 5293 "How to ask for confirmation when leaving Emacs.