1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 20:32:00 -08:00

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
This commit is contained in:
Miles Bader 2007-03-31 09:43:42 +00:00
parent 8c01db22ac
commit 87ba2830aa
3 changed files with 19 additions and 3 deletions

View file

@ -3,6 +3,16 @@
* message.el (message-yank-original): Fix bug:
Don't switch point and mark unnecessarily.
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 Reiner Steib <Reiner.Steib@gmx.de>
* gnus-art.el (gnus-button-alist): Also catch `<f1> k ...'.
2007-03-20 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
* message.el (message-required-news-headers):

View file

@ -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\\|<?[Ff]1>?\\)[ \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\\|<?[Ff]1>?\\)[ \t\n]+k[ \t\n]+\\([^']+\\)\\)'"
("`\\(\\(C-h\\|<?[Ff]1>?\\)[ \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)

View file

@ -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))