diff options
author | Miles Bader <miles@gnu.org> | 2007-03-31 09:43:42 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-03-31 09:43:42 +0000 |
commit | 87ba2830aa7c19d25780ffb29f5cc5f4e4a8b92d (patch) | |
tree | 32599bdcd59199a73d6446039d2d77e21551535a /lisp/gnus/gnus-msg.el | |
parent | 8c01db22ac190a8b33f3bb2ca2c75609e72bdbbe (diff) | |
download | emacs-87ba2830aa7c19d25780ffb29f5cc5f4e4a8b92d.tar.gz |
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
Diffstat (limited to 'lisp/gnus/gnus-msg.el')
-rw-r--r-- | lisp/gnus/gnus-msg.el | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index cace5028f96..aaf30700e3d 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/gnus-msg.el @@ -393,6 +393,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'. @@ -514,7 +521,6 @@ Gcc: header for archiving purposes." (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)) |