Mercurial > emacs
changeset 111360:3c958232fff8
Backport Bug#6765 fix from trunk.
* mouse.el (mouse-fixup-help-message): Match "mouse-2" only at the
beginning of the string. Use `string-match-p'. (Bug#6765)
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 04 Nov 2010 15:27:46 -0400 |
| parents | 57927f4ca500 |
| children | 1b94785df959 1d6217a47474 |
| files | lisp/ChangeLog lisp/mouse.el |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Nov 04 17:00:35 2010 +0100 +++ b/lisp/ChangeLog Thu Nov 04 15:27:46 2010 -0400 @@ -1,3 +1,8 @@ +2010-08-01 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * mouse.el (mouse-fixup-help-message): Match "mouse-2" only at the + beginning of the string. Use `string-match-p'. (Bug#6765) + 2010-11-01 Glenn Morris <rgm@gnu.org> * locate.el (locate, locate-mode): Doc fixes.
--- a/lisp/mouse.el Thu Nov 04 17:00:35 2010 +0100 +++ b/lisp/mouse.el Thu Nov 04 15:27:46 2010 -0400 @@ -886,8 +886,7 @@ (let (mp pos) (if (and mouse-1-click-follows-link (stringp msg) - (save-match-data - (string-match "^mouse-2" msg)) + (string-match-p "\\`mouse-2" msg) (setq mp (mouse-pixel-position)) (consp (setq pos (cdr mp))) (car pos) (>= (car pos) 0)