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

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 99774 [merge]
committer: Katsumi Yamaoka <address@hidden>
branch nick: emacs-23
timestamp: Thu 2010-04-22 23:43:10 +0000
message:
  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 <address@hidden>.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-04-18 23:24:22 +0000
+++ b/lisp/gnus/ChangeLog       2010-04-22 23:41:53 +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-27 17:53:35 +0000
+++ b/lisp/gnus/message.el      2010-04-22 23:41:53 +0000
@@ -5880,6 +5880,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.