Synch to No Gnus 200504211823.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ffa420a..8d7d006 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-21  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * message.el (message-kill-buffer-query): Renamed from
+       `message-kill-buffer-query-if-modified'.  Added :version.
+
 2005-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mml.el (mml-preview): Bind gnus-message-buffer while setting the

diff --git a/lisp/message.el b/lisp/message.el
index aa37162..be0326a 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -549,9 +549,10 @@ command `message-mimic-kill-buffer' is used."
   :group 'message-buffers
   :type 'boolean)
 
-(defcustom message-kill-buffer-query-if-modified t
+(defcustom message-kill-buffer-query t
   "*Non-nil means that killing a modified message buffer has to be confirmed.
 This is used by `message-kill-buffer'."
+  :version "23.0" ;; No Gnus
   :group 'message-buffers
   :type 'boolean)
 
@@ -3791,7 +3792,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)
+           (not message-kill-buffer-query)
            (eq t message-kill-buffer-query-function)
            (funcall message-kill-buffer-query-function
                     "The buffer modified; kill anyway? "))