[Emacs-diffs] /srv/bzr/emacs/trunk r100957: mouse.el: Match "mouse-2" at the beginning of the string. (Bug#6765)

[Juanma Barranquero]

------------------------------------------------------------
revno: 100957
author: YAMAMOTO Mitsuharu <address@hidden>
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sun 2010-08-01 18:48:15 +0200
message:
  mouse.el: Match "mouse-2" at the beginning of the string.  (Bug#6765)
modified:
  lisp/ChangeLog
  lisp/mouse.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-08-01 13:57:07 +0000
+++ b/lisp/ChangeLog    2010-08-01 16:48:15 +0000
@@ -1,3 +1,8 @@
+2010-08-01  YAMAMOTO Mitsuharu  <address@hidden>
+
+       * 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  <address@hidden>
 
        * cus-start.el (x-gtk-use-system-tooltips): New variable.

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2010-07-31 21:26:56 +0000
+++ b/lisp/mouse.el     2010-08-01 16:48:15 +0000
@@ -879,8 +879,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)