diff lisp/gnus/gnus-msg.el @ 76820:665998d6d5de

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/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 Reiner Steib <Reiner.Steib@gmx.de> * lisp/gnus/gnus-art.el (gnus-button-alist): Also catch `<f1> k ...'. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-685
author Miles Bader <miles@gnu.org>
date Sat, 31 Mar 2007 09:43:42 +0000
parents e3694f1cb928
children e9a67d6e120b
line wrap: on
line diff
--- a/lisp/gnus/gnus-msg.el	Sat Mar 31 09:37:59 2007 +0000
+++ b/lisp/gnus/gnus-msg.el	Sat Mar 31 09:43:42 2007 +0000
@@ -393,6 +393,13 @@
        (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'.
@@ -514,7 +521,6 @@
   (setq message-post-method
 	`(lambda (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))