From: Lars Ingebrigtsen Date: Mon, 10 Feb 2014 06:07:30 +0000 (-0800) Subject: * files.el (confirm-kill-emacs): Clarify doc (bug#15455). X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~47 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f3c602419225001790b4a9b4196b89ab83b3a965;p=emacs.git * files.el (confirm-kill-emacs): Clarify doc (bug#15455). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3a73bbd2fee..285cefe7333 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2014-02-10 Lars Ingebrigtsen + * files.el (confirm-kill-emacs): Clarify doc (bug#15455). + * emacs-lisp/lisp.el (up-list): Doc fix (bug#15832). * files.el (confirm-kill-emacs): Allow specifying an arbitrary diff --git a/lisp/files.el b/lisp/files.el index 88b6ae6dae7..7d20e1456b6 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -6498,7 +6498,7 @@ the low level primitive, does not. See also `kill-emacs-hook'.") (defcustom confirm-kill-emacs nil "How to ask for confirmation when leaving Emacs. If nil, the default, don't ask at all. If the value is non-nil, it should -be a predicate function such as `yes-or-no-p'." +be a predicate function; for example `yes-or-no-p'." :type '(choice (const :tag "Ask with yes-or-no-p" yes-or-no-p) (const :tag "Ask with y-or-n-p" y-or-n-p) (const :tag "Don't confirm" nil)