message.el (message-setup-1): Handle message-generate-headers-first set to t.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ceef5e5df2b1db604bcff4a9a432b07d1f40a4d5..7571016a8cb11dacedd9af0e0d09a26a7b5838ee 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-06  Julien Danjou  <julien@danjou.info>
+
+       * message.el (message-setup-1): Handle message-generate-headers-first
+       set to t.
+
 2011-02-04  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * message.el (message-setup-1): Remove the read-only stuff, since it

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 37d64bc5f1b02466e38f3069426316636c82d460..3ba57caba4f902e06a98973188e8091703f5ea49 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6417,7 +6417,9 @@ are not included."
   ;; `References:' header if `message-generate-headers-first' was nil.
   ;; Therefore, always generate it first.
   (let ((message-generate-headers-first
-         (append message-generate-headers-first '(References))))
+         (if (eq message-generate-headers-first t)
+             t
+           (append message-generate-headers-first '(References)))))
     (when (message-news-p)
       (when message-default-news-headers
         (insert message-default-news-headers)