2010-02-16 Glenn Morris <rgm@gnu.org>

	* message.el (message-default-mail-headers): Change the default value
	to ease the transition from mail-mode to message-mode.  (Bug#5555)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 583fbf6..8a8c0af 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-16  Glenn Morris  <rgm@gnu.org>
+
+       * message.el (message-default-mail-headers): Change the default value
+       to ease the transition from mail-mode to message-mode.  (Bug#5555)
+
 2010-01-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * parse-time.el (parse-time-syntax): Define it for only XEmacs.

diff --git a/lisp/message.el b/lisp/message.el
index df4f555..f7bcb56 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1140,8 +1140,22 @@ these lines."
   :link '(custom-manual "(message)Message Headers")
   :type 'message-header-lines)
 
-(defcustom message-default-mail-headers ""
+(defcustom message-default-mail-headers
+  ;; 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)
+           "")
+         (if (and (boundp 'mail-self-blind)
+                  mail-self-blind)
+             (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)
+           ""))
   "*A string of header lines to be inserted in outgoing mails."
+  :version "23.2"
   :group 'message-headers
   :group 'message-mail
   :link '(custom-manual "(message)Mail Headers")
@@ -2730,7 +2744,7 @@ PGG manual, depending on the value of `mml2015-use'."
 ;;; Forbidden properties
 ;;
 ;; We use `after-change-functions' to keep special text properties
-;; that interfer with the normal function of message mode out of the
+;; that interfere with the normal function of message mode out of the
 ;; buffer.
 
 (defcustom message-strip-special-text-properties t