From: Glenn Morris <rgm@gnu.org>
Date: Tue, 16 Feb 2010 02:48:08 +0000 (-0800)
Subject: Change a custom default to ease the mail->message transition.
X-Git-Tag: emacs-pretest-23.1.93~56^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc4d62739d4f483514c9763edea82e5858fa0460;p=emacs.git

Change a custom default to ease the mail->message transition.

* 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/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1c1c62bb1b0..a6d5f2040fe 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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-17  Chong Yidong  <cyd@stupidchicken.com>
 
 	* message.el (message-mail): Just pass yank-action on to message-setup.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 7194813422a..3a8c104b8e5 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1178,8 +1178,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")
@@ -2768,7 +2782,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