Fix mail-default-headers handling in Message mode.

* gnus/message.el (message-default-mail-headers):
(message-default-headers): Carry the value mail-default-headers over
into message-default-mail-headers, rather than message-default-headers.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 10185007bf69b777d6db4847daaa1db4b17642f5..7f37775bc5d2f48df70a518785349a450c9a82eb 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-27  Chong Yidong  <cyd@stupidchicken.com>
+
+       * message.el (message-default-mail-headers):
+       (message-default-headers): Carry the value mail-default-headers over
+       into message-default-mail-headers, rather than message-default-headers.
+
 2010-03-22  Juanma Barranquero  <lekktu@gmail.com>
 
        * message.el (message-interactive): Doc fix.

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index f2a3f921cdb8e9e782e9d216570e0f7869b84702..27266f8aec14f59bebff9d2aa5c66ebd1a2e377f 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1170,11 +1170,7 @@ It is a vector of the following headers:
   :valid-regexp "^\\'"
   :error "All header lines must be newline terminated")
 
-(defcustom message-default-headers
-  ;; Default to the value of `mail-default-headers' if available.
-  ;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is unavailable
-  ;; unless sendmail.el is loaded.
-  (if (boundp 'mail-default-headers) mail-default-headers "")
+(defcustom message-default-headers ""
   "*A string containing header lines to be inserted in outgoing messages.
 It is inserted before you edit the message, so you can edit or delete
 these lines."
@@ -1187,16 +1183,18 @@ these lines."
   ;; Ease the transition from mail-mode to message-mode.  See bugs#4431, 5555.
   (concat (if (and (boundp 'mail-default-reply-to)
                   (stringp mail-default-reply-to))
-             (format "Reply-to: %s\n" mail-default-reply-to)
-           "")
+             (format "Reply-to: %s\n" mail-default-reply-to))
          (if (and (boundp 'mail-self-blind)
                   mail-self-blind)
-             (format "BCC: %s\n" user-mail-address)
-           "")
+             (format "BCC: %s\n" user-mail-address))
          (if (and (boundp 'mail-archive-file-name)
                   (stringp mail-archive-file-name))
-             (format "FCC: %s\n" mail-archive-file-name)
-           ""))
+             (format "FCC: %s\n" mail-archive-file-name))
+         ;; Use the value of `mail-default-headers' if available.
+         ;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is
+         ;; unavailable unless sendmail.el is loaded.
+         (if (boundp 'mail-default-headers)
+             mail-default-headers))
   "*A string of header lines to be inserted in outgoing mails."
   :version "23.2"
   :group 'message-headers