diff options
| author | Lars Ingebrigtsen | 2016-04-28 15:34:51 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-04-28 15:34:51 +0200 |
| commit | 355c8b5810cd66c2c41e8479d301af76a3ff9bdb (patch) | |
| tree | 024375e37771f61885153ae0f31ef1aa99b26e71 | |
| parent | d160f530328fa2872296485b92602435921bd4fd (diff) | |
| download | emacs-355c8b5810cd66c2c41e8479d301af76a3ff9bdb.tar.gz emacs-355c8b5810cd66c2c41e8479d301af76a3ff9bdb.zip | |
Make kill-emacs-query-functions into defcustom
* lisp/files.el (save-buffers-kill-terminal): Mention
`save-buffers-kill-emacs' (bug#10794).
(kill-emacs-query-functions): Made into a defcustom.
| -rw-r--r-- | lisp/files.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/files.el b/lisp/files.el index d5b34af86ba..2857f6dfcac 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -6663,11 +6663,14 @@ message to that effect instead of signaling an error." | |||
| 6663 | ;; Simulate the message printed by `ls'. | 6663 | ;; Simulate the message printed by `ls'. |
| 6664 | (insert (format "%s: No such file or directory\n" file)))) | 6664 | (insert (format "%s: No such file or directory\n" file)))) |
| 6665 | 6665 | ||
| 6666 | (defvar kill-emacs-query-functions nil | 6666 | (defcustom kill-emacs-query-functions nil |
| 6667 | "Functions to call with no arguments to query about killing Emacs. | 6667 | "Functions to call with no arguments to query about killing Emacs. |
| 6668 | If any of these functions returns nil, killing Emacs is canceled. | 6668 | If any of these functions returns nil, killing Emacs is canceled. |
| 6669 | `save-buffers-kill-emacs' calls these functions, but `kill-emacs', | 6669 | `save-buffers-kill-emacs' calls these functions, but `kill-emacs', |
| 6670 | the low level primitive, does not. See also `kill-emacs-hook'.") | 6670 | the low level primitive, does not. See also `kill-emacs-hook'." |
| 6671 | :type 'hook | ||
| 6672 | :version "25.2" | ||
| 6673 | :group 'convenience) | ||
| 6671 | 6674 | ||
| 6672 | (defcustom confirm-kill-emacs nil | 6675 | (defcustom confirm-kill-emacs nil |
| 6673 | "How to ask for confirmation when leaving Emacs. | 6676 | "How to ask for confirmation when leaving Emacs. |
| @@ -6726,7 +6729,8 @@ if any returns nil. If `confirm-kill-emacs' is non-nil, calls it." | |||
| 6726 | 6729 | ||
| 6727 | (defun save-buffers-kill-terminal (&optional arg) | 6730 | (defun save-buffers-kill-terminal (&optional arg) |
| 6728 | "Offer to save each buffer, then kill the current connection. | 6731 | "Offer to save each buffer, then kill the current connection. |
| 6729 | If the current frame has no client, kill Emacs itself. | 6732 | If the current frame has no client, kill Emacs itself using |
| 6733 | `save-buffers-kill-emacs'. | ||
| 6730 | 6734 | ||
| 6731 | With prefix ARG, silently save all file-visiting buffers, then kill. | 6735 | With prefix ARG, silently save all file-visiting buffers, then kill. |
| 6732 | 6736 | ||