From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Thu, 22 Apr 2010 08:24:25 +0000 (+0000)
Subject: (message-generate-headers): Record insertion of optional headers as well.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~434
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=731533fdb6cf0f0db6fd258b45baabe9e148f459;p=emacs.git

(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>.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 94524c262ac..f07f0da6253 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 7a96d2480b4..79a88cd6bd3 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5905,6 +5905,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.