[Emacs-diffs] /srv/bzr/emacs/trunk r99504: Change a custom default to ease the mail->message transition.

[Glenn Morris]

------------------------------------------------------------
revno: 99504
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2010-02-15 18:48:08 -0800
message:
  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)
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-01-17 23:49:27 +0000
+++ b/lisp/gnus/ChangeLog       2010-02-16 02:48:08 +0000
@@ -1,3 +1,8 @@
+2010-02-16  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * message.el (message-mail): Just pass yank-action on to message-setup.

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2010-01-17 23:49:27 +0000
+++ b/lisp/gnus/message.el      2010-02-16 02:48:08 +0000
@@ -1178,8 +1178,22 @@
   :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 @@
 ;;; 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