Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 211)

   - Update from CVS

2007-03-25  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * lisp/gnus-msg.el (gnus-setup-message, gnus-inews-add-send-actions): Move
   evaluation of gnus-extended-version to ensure correct generation of the
   User-Agent header when message-generate-headers-first is used.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-308

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 675993f..796bcbf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -26,6 +26,12 @@
        string.
        (gnus-button-alist): Also catch `<f1> k ...'.
 
+2007-03-25  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * gnus-msg.el (gnus-setup-message, gnus-inews-add-send-actions): Move
+       evaluation of gnus-extended-version to ensure correct generation of the
+       User-Agent header when message-generate-headers-first is used.
+
 2007-03-24  Simon Josefsson  <simon@josefsson.org>
 
        * hashcash.el (hashcash-generate-payment-async): Don't crash if

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 38f2842..1c0d494 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1416,9 +1416,9 @@ predicate.  See Info node `(gnus)Customizing Articles'."
              (executable-find "icontopbm")))
        'head)
   "Display X-Face headers.
-Valid values are nil, t, `head', `first', `last', an integer or a
-predicate.  See Info node `(gnus)Customizing Articles' and Info
-node `(gnus)X-Face' for details."
+Valid values are nil and `head'.
+See Info node `(gnus)Customizing Articles' and Info node
+`(gnus)X-Face' for details."
   :group 'gnus-article-treat
   :version "21.1"
   :link '(custom-manual "(gnus)Customizing Articles")

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index fd058fa..dd4aa30 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -400,6 +400,13 @@ Thank you for your help in stamping out bugs.
        (setq mml-buffer-list nil)
        (add-hook 'message-header-setup-hook 'gnus-inews-insert-gcc)
        (add-hook 'message-header-setup-hook 'gnus-inews-insert-archive-gcc)
+       ;; message-newsreader and message-mailer were formerly set in
+       ;; gnus-inews-add-send-actions, but this is too late when
+       ;; message-generate-headers-first is used. --ansel
+       (add-hook 'message-mode-hook
+                (lambda nil
+                  (setq message-newsreader
+                        (setq message-mailer (gnus-extended-version)))))
        ;; #### FIXME: for a reason that I did not manage to identify yet,
        ;; the variable `gnus-newsgroup-name' does not honor a dynamically
        ;; scoped or setq'ed value from a caller like `C-u gnus-summary-mail'.
@@ -532,7 +539,6 @@ Gcc: header for archiving purposes."
   (setq message-post-method
        `(lambda (&optional arg)
           (gnus-post-method arg ,gnus-newsgroup-name)))
-  (setq message-newsreader (setq message-mailer (gnus-extended-version)))
   (message-add-action
    `(when (gnus-buffer-exists-p ,buffer)
       (set-window-configuration ,winconf))