From: Miles Bader Date: Sat, 31 Mar 2007 09:43:42 +0000 (+0000) Subject: Merge from gnus--rel--5.10 X-Git-Tag: emacs-pretest-22.0.97~104 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=87ba2830aa7c19d25780ffb29f5cc5f4e4a8b92d;p=emacs.git Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 211) - Update from CVS 2007-03-25 Andreas Seltenreich * 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 * lisp/gnus/gnus-art.el (gnus-button-alist): Also catch ` k ...'. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-685 --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 918b4bd3ef3..a48bc194909 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -3,6 +3,16 @@ * message.el (message-yank-original): Fix bug: Don't switch point and mark unnecessarily. +2007-03-25 Andreas Seltenreich + + * 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 + + * gnus-art.el (gnus-button-alist): Also catch ` k ...'. + 2007-03-20 Andreas Seltenreich * message.el (message-required-news-headers): diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index c6ac13af6c9..552f3a68f49 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -1332,7 +1332,7 @@ See Info node `(gnus)Customizing Articles' for details." (executable-find "icontopbm"))) 'head) "Display X-Face headers. -Valid values are nil, t, `head', `last', an integer or a predicate. +Valid values are nil and `head'. See Info node `(gnus)Customizing Articles' and Info node `(gnus)X-Face' for details." :group 'gnus-article-treat @@ -6620,7 +6620,7 @@ positives are possible." 0 (>= gnus-button-emacs-level 1) gnus-button-handle-describe-function 2) ("\\b\\(C-h\\|?\\)[ \t\n]+v[ \t\n]+\\([^ \t\n]+\\)[ \t\n]+RET" 0 (>= gnus-button-emacs-level 1) gnus-button-handle-describe-variable 2) - ("`\\(\\b\\(C-h\\|?\\)[ \t\n]+k[ \t\n]+\\([^']+\\)\\)'" + ("`\\(\\(C-h\\|?\\)[ \t\n]+k[ \t\n]+\\([^']+\\)\\)'" ;; Unlike the other regexps we really have to require quoting ;; here to determine where it ends. 1 (>= gnus-button-emacs-level 1) gnus-button-handle-describe-key 3) 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))