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)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8591e2171f3d20e744b964782a187498499902a9..5bfe571f03154a5bc8f6644b997dd11b55ab2c4e 100644 (file)
--- 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 be63f1d73d2eab186ca576394b2d58d52fd4e76c..e88c266971421e39dbb8c38b5b33e784da48bf3f 100644 (file)
--- 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)