[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100159: Backport Bug#6765 fix from trunk.

[Chong Yidong]

------------------------------------------------------------
revno: 100159
author: YAMAMOTO Mitsuharu <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Thu 2010-11-04 15:27:46 -0400
message:
  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)
modified:
  lisp/ChangeLog
  lisp/mouse.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-01 06:55:49 +0000
+++ b/lisp/ChangeLog    2010-11-04 19:27:46 +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-11-01  Glenn Morris  <address@hidden>
 
        * locate.el (locate, locate-mode): Doc fixes.

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2010-07-06 19:42:46 +0000
+++ b/lisp/mouse.el     2010-11-04 19:27:46 +0000
@@ -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)