mouse.el: Match "mouse-2" at the beginning of the string. (Bug#6765)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5509b1598a4a628c9426331e10523d799bab759c..18b21843e877427dd50a3c96ba01ca8453463913 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-08-01  Jan Djärv  <jan.h.d@swipnet.se>
 
        * cus-start.el (x-gtk-use-system-tooltips): New variable.

diff --git a/lisp/mouse.el b/lisp/mouse.el
index b928f636bd51d3289612e1022f9063a774b8ff7f..27587677513598935c033dec917f00a5f3577a70 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -879,8 +879,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)