# HG changeset patch # User Stefan Monnier # Date 1295631513 18000 # Node ID 0bfcbd0b704ba4b8565377d839f68c1d4aea362d # Parent a7191495c39c3ff2bb92356cb956796d5bb8ed38 * gnus-art.el (gnus-button-alist, gnus-button-handle-info-keystrokes): Don't confuse the "ret" of "retrograde" with RET. diff -r a7191495c39c -r 0bfcbd0b704b lisp/gnus/ChangeLog --- a/lisp/gnus/ChangeLog Fri Jan 21 11:36:24 2011 -0500 +++ b/lisp/gnus/ChangeLog Fri Jan 21 12:38:33 2011 -0500 @@ -1,3 +1,8 @@ +2011-01-21 Stefan Monnier + + * gnus-art.el (gnus-button-alist, gnus-button-handle-info-keystrokes): + Don't confuse the "ret" of "retrograde" with RET. + 2011-01-21 Katsumi Yamaoka * gnus-art.el (gnus-article-remove-images, gnus-article-show-images): diff -r a7191495c39c -r 0bfcbd0b704b lisp/gnus/gnus-art.el --- a/lisp/gnus/gnus-art.el Fri Jan 21 11:36:24 2011 -0500 +++ b/lisp/gnus/gnus-art.el Fri Jan 21 12:38:33 2011 -0500 @@ -7479,17 +7479,17 @@ ;; Info links like `C-h i d m Gnus RET' or `C-h i d m Gnus RET i partial RET' 0 (>= gnus-button-emacs-level 1) gnus-button-handle-info-keystrokes 0) ;; This is custom - ("M-x[ \t\n]\\(customize-[^ ]+\\)[ \t\n]RET[ \t\n]\\([^ ]+\\)[ \t\n]RET" 0 + ("M-x[ \t\n]\\(customize-[^ ]+\\)[ \t\n]RET[ \t\n]\\([^ ]+\\)[ \t\n]RET\\>" 0 (>= gnus-button-emacs-level 1) gnus-button-handle-custom 1 2) ;; Emacs help commands - ("M-x[ \t\n]+apropos[ \t\n]+RET[ \t\n]+\\([^ \t\n]+\\)[ \t\n]+RET" + ("M-x[ \t\n]+apropos[ \t\n]+RET[ \t\n]+\\([^ \t\n]+\\)[ \t\n]+RET\\>" ;; regexp doesn't match arguments containing ` '. 0 (>= gnus-button-emacs-level 1) gnus-button-handle-apropos 1) - ("M-x[ \t\n]+apropos-command[ \t\n]+RET[ \t\n]+\\([^ \t\n]+\\)[ \t\n]+RET" + ("M-x[ \t\n]+apropos-command[ \t\n]+RET[ \t\n]+\\([^ \t\n]+\\)[ \t\n]+RET\\>" 0 (>= gnus-button-emacs-level 1) gnus-button-handle-apropos-command 1) - ("M-x[ \t\n]+apropos-variable[ \t\n]+RET[ \t\n]+\\([^ \t\n]+\\)[ \t\n]+RET" + ("M-x[ \t\n]+apropos-variable[ \t\n]+RET[ \t\n]+\\([^ \t\n]+\\)[ \t\n]+RET\\>" 0 (>= gnus-button-emacs-level 1) gnus-button-handle-apropos-variable 1) - ("M-x[ \t\n]+apropos-documentation[ \t\n]+RET[ \t\n]+\\([^ \t\n]+\\)[ \t\n]+RET" + ("M-x[ \t\n]+apropos-documentation[ \t\n]+RET[ \t\n]+\\([^ \t\n]+\\)[ \t\n]+RET\\>" 0 (>= gnus-button-emacs-level 1) gnus-button-handle-apropos-documentation 1) ;; The following entries may lead to many false positives so don't enable ;; them by default (use a high button level). @@ -7504,11 +7504,11 @@ 0 (>= gnus-button-emacs-level 9) gnus-button-handle-symbol 1) ("(setq[ \t\n]+\\([a-z][a-z0-9]+-[-a-z0-9]+\\)[ \t\n]+.+)" 1 (>= gnus-button-emacs-level 7) gnus-button-handle-describe-variable 1) - ("\\bM-x[ \t\n]+\\([^ \t\n]+\\)[ \t\n]+RET" + ("\\bM-x[ \t\n]+\\([^ \t\n]+\\)[ \t\n]+RET\\>" 1 (>= gnus-button-emacs-level 7) gnus-button-handle-describe-function 1) - ("\\b\\(C-h\\|?\\)[ \t\n]+f[ \t\n]+\\([^ \t\n]+\\)[ \t\n]+RET" + ("\\b\\(C-h\\|?\\)[ \t\n]+f[ \t\n]+\\([^ \t\n]+\\)[ \t\n]+RET\\>" 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" + ("\\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) ("`\\(\\(C-h\\|?\\)[ \t\n]+k[ \t\n]+\\([^']+\\)\\)'" ;; Unlike the other regexps we really have to require quoting @@ -8033,7 +8033,7 @@ (if (string-match (concat "\\b\\(C-h\\|?\\)[ \t\n]+i[ \t\n]+d?[ \t\n]?m[ \t\n]+" "\\([^ ]+ ?[^ ]+\\)[ \t\n]+RET" - "\\([ \t\n]+i[ \t\n]+[^ ]+ ?[^ ]+[ \t\n]+RET" + "\\([ \t\n]+i[ \t\n]+[^ ]+ ?[^ ]+[ \t\n]+RET\\>" "\\(?:[ \t\n,]*\\)\\)?") url) (setq node (match-string 2 url) @@ -8043,7 +8043,7 @@ (Info-directory) (Info-menu node) (when (> (length indx) 0) - (string-match (concat "[ \t\n]+i[ \t\n]+\\([^ ]+ ?[^ ]+\\)[ \t\n]+RET" + (string-match (concat "[ \t\n]+i[ \t\n]+\\([^ ]+ ?[^ ]+\\)[ \t\n]+RET\\>" "\\([ \t\n,]*\\)") indx) (setq comma (match-string 2 indx))