[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99688: Fix mail-default-headers h
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99688: Fix mail-default-headers handling in Message mode. |
Date: |
Sat, 27 Mar 2010 13:53:35 -0400 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 99688
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-03-27 13:53:35 -0400
message:
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.
modified:
lisp/gnus/ChangeLog
lisp/gnus/message.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-03-22 15:49:52 +0000
+++ b/lisp/gnus/ChangeLog 2010-03-27 17:53:35 +0000
@@ -1,3 +1,9 @@
+2010-03-27 Chong Yidong <address@hidden>
+
+ * 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 <address@hidden>
* message.el (message-interactive): Doc fix.
=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el 2010-03-22 15:49:52 +0000
+++ b/lisp/gnus/message.el 2010-03-27 17:53:35 +0000
@@ -1170,11 +1170,7 @@
: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 @@
;; 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r99688: Fix mail-default-headers handling in Message mode.,
Chong Yidong <=