summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2010-04-22 23:41:53 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2010-04-22 23:41:53 +0000
commitc4498ffd1482d5155129cb05d613a2ef4a7d5ca0 (patch)
tree9f98ed3a3f0749728dd12a97beb3402d4f20b110
parentb106e264898b428321b21beef178b4e09f175128 (diff)
downloademacs-c4498ffd1482d5155129cb05d613a2ef4a7d5ca0.tar.gz
Synch with Gnus trunk:
;; I've committed this change to only the trunk by mistake, sorry, ;; but it should have been also in the branch.) (message-generate-headers): Record insertion of optional headers as well. Otherwise the check to prevent repeated insertion of optional headers is a no-op. By Andreas Seltenreich <seltenreich@gmx.de>.
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/message.el1
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5e70b49a862..ab1210af5b5 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-22 Andreas Seltenreich <seltenreich@gmx.de>
+
+ * message.el (message-generate-headers): Record insertion of optional
+ headers as well. Otherwise the check to prevent repeated insertion of
+ optional headers is a no-op.
+
2010-04-17 Teodor Zlatanov <tzz@lifelogs.com>
* smime.el: Don't mention CVS.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 27266f8aec1..2fe8a4d32ef 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5880,6 +5880,7 @@ Headers already prepared in the buffer are not modified."
(if formatter
(funcall formatter header value)
(insert header-string ": " value))
+ (push header-string message-inserted-headers)
(goto-char (message-fill-field))
;; We check whether the value was ended by a
;; newline. If not, we insert one.