* files.el (confirm-kill-emacs): Allow specifying an arbitrary predicate function.

Fixes: debbugs:15455

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b76e0c174c2ce960753f56dee61efcfc4309a6ba..42af81b22178d915086e484a967e6c777f65d913 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-10  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * files.el (confirm-kill-emacs): Allow specifying an arbitrary
+       predicate function (bug#15455).
+
 2014-02-10  Dmitry Gutov  <dgutov@yandex.ru>
 
        * ielm.el (inferior-emacs-lisp-mode): Instead of

diff --git a/lisp/files.el b/lisp/files.el
index 686a1b7c5d3725fe6515a208eda42b2be64158f8..88b6ae6dae7042d37f15e81176ce0e2fdbfb40ec 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6501,7 +6501,8 @@ 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'."
   :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))
+                (const :tag "Don't confirm" nil)
+                (function :tag "Predicate function"))
   :group 'convenience
   :version "21.1")