[Emacs-diffs] /srv/bzr/emacs/trunk r99989: Synch with Gnus trunk:

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 99989 [merge]
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-04-22 08:25:46 +0000
message:
  Synch with Gnus trunk:
  (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 <address@hidden>.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-04-19 15:07:52 +0000
+++ b/lisp/gnus/ChangeLog       2010-04-22 08:24:25 +0000
@@ -1,3 +1,9 @@
+2010-04-22  Andreas Seltenreich  <address@hidden>
+
+       * 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  <address@hidden>
 
        * smime.el: Don't mention CVS.

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2010-03-31 02:37:57 +0000
+++ b/lisp/gnus/message.el      2010-04-22 08:24:25 +0000
@@ -5905,6 +5905,7 @@
                      (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.