Synch to No Gnus 200504141527.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bbdbba5..37111d6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-14  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * message.el (message-kill-buffer-query-if-modified): new variable
+       so the user can kill a modified message buffer quickly
+       (message-kill-buffer): use it.
+
 2005-04-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lpath.el: Fbind display-time-event-handler; don't fbind

diff --git a/lisp/message.el b/lisp/message.el
index 1128738..aa37162 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -534,8 +534,8 @@ should return the new buffer name."
   :type 'boolean)
 
 (defcustom message-kill-buffer-query-function 'yes-or-no-p
-  "*Function used to prompt user whether to kill the message buffer.  If
-it is t, the buffer will be killed unconditionally."
+  "*Function used to prompt user whether to kill the message buffer.
+If it is t, the buffer will be killed unconditionally."
   :type '(radio (function-item yes-or-no-p)
                (function-item y-or-n-p)
                (function-item nnheader-Y-or-n-p)
@@ -549,6 +549,12 @@ command `message-mimic-kill-buffer' is used."
   :group 'message-buffers
   :type 'boolean)
 
+(defcustom message-kill-buffer-query-if-modified t
+  "*Non-nil means that killing a modified message buffer has to be confirmed.
+This is used by `message-kill-buffer'."
+  :group 'message-buffers
+  :type 'boolean)
+
 (eval-when-compile
   (defvar gnus-local-organization))
 (defcustom message-user-organization
@@ -3785,6 +3791,7 @@ Instead, just auto-save the buffer and then bury it."
   "Kill the current buffer."
   (interactive)
   (when (or (not (buffer-modified-p))
+           (not message-kill-buffer-query-if-modified)
            (eq t message-kill-buffer-query-function)
            (funcall message-kill-buffer-query-function
                     "The buffer modified; kill anyway? "))