Mercurial > emacs
diff lisp/gnus/gnus-art.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 | 69ddf7e920dd |
| children | 56cc03f5f68c 4ef881a120fe |
line wrap: on
line diff
--- a/lisp/gnus/gnus-art.el Sat Mar 31 09:37:59 2007 +0000 +++ b/lisp/gnus/gnus-art.el Sat Mar 31 09:43:42 2007 +0000 @@ -1332,7 +1332,7 @@ (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 @@ 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)