diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2010-11-04 15:27:46 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-11-04 15:27:46 -0400 |
| commit | 00d9e115db74c5f22b198b430bbdb11378a3b4b8 (patch) | |
| tree | ba6a981497a49b2d44ea6e64a2d493c1208b1eda | |
| parent | f34477d7f057db3225b2f4335cc71cf556c6ad32 (diff) | |
| download | emacs-00d9e115db74c5f22b198b430bbdb11378a3b4b8.tar.gz | |
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)
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/mouse.el | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8591e2171f3..5bfe571f031 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/mouse.el b/lisp/mouse.el index be63f1d73d2..e88c2669714 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -886,8 +886,7 @@ at the same position." (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) |