[Emacs-diffs] emacs-24 r117429: * lisp/info.el (Info-mode-map): Override a global down-mouse-2 binding.

[Stefan Monnier]

------------------------------------------------------------
revno: 117429
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18212
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-08-07 14:35:54 -0400
message:
  * lisp/info.el (Info-mode-map): Override a global down-mouse-2 binding.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/info.el                   info.el-20091113204419-o5vbwnq5f7feedwu-261
  lisp/mouse.el                  mouse.el-20091113204419-o5vbwnq5f7feedwu-123

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-08-05 13:34:06 +0000
+++ b/lisp/ChangeLog    2014-08-07 18:35:54 +0000
@@ -1,9 +1,14 @@
+2014-08-07  Stefan Monnier  <address@hidden>
+
+       * info.el (Info-mode-map): Override a global down-mouse-2 binding
+       (bug#18212).
+
 2014-08-05  Eli Zaretskii  <address@hidden>
 
        * simple.el (default-line-height): A floating-point value of
        line-spacing means a fraction of the default frame font's height,
-       not of the font currently used by the 'default' face.  Truncate
-       the pixel value, like the display engine does.
+       not of the font currently used by the 'default' face.
+       Truncate the pixel value, like the display engine does.
        (window-screen-lines): Use window-inside-pixel-edges for
        determining the window height in pixels.  (Bug#18195)
 
@@ -105,8 +110,8 @@
 2014-07-19  Fabián Ezequiel Gallina  <address@hidden>
 
        Fix Python shell prompts detection for remote hosts.
-       * progmodes/python.el (python-shell-prompt-detect): Replace
-       call-process with process-file and make it more robust.
+       * progmodes/python.el (python-shell-prompt-detect):
+       Replace call-process with process-file and make it more robust.
 
 2014-07-17  Fabián Ezequiel Gallina  <address@hidden>
 

=== modified file 'lisp/info.el'
--- a/lisp/info.el      2014-03-14 20:51:22 +0000
+++ b/lisp/info.el      2014-08-07 18:35:54 +0000
@@ -3994,6 +3994,7 @@
     (define-key map "," 'Info-index-next)
     (define-key map "\177" 'Info-scroll-down)
     (define-key map [mouse-2] 'Info-mouse-follow-nearest-node)
+    (define-key map [down-mouse-2] 'ignore) ;Override potential global binding.
     (define-key map [follow-link] 'mouse-face)
     (define-key map [XF86Back] 'Info-history-back)
     (define-key map [XF86Forward] 'Info-history-forward)

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2014-07-02 14:42:00 +0000
+++ b/lisp/mouse.el     2014-08-07 18:35:54 +0000
@@ -94,15 +94,14 @@
 (defun mouse--down-1-maybe-follows-link (&optional _prompt)
   "Turn `mouse-1' events into `mouse-2' events if follows-link.
 Expects to be bound to `down-mouse-1' in `key-translation-map'."
-  (if (or (null mouse-1-click-follows-link)
-          (not (eq (if (eq mouse-1-click-follows-link 'double)
-                       'double-down-mouse-1 'down-mouse-1)
-                   (car-safe last-input-event)))
-          (not (mouse-on-link-p (event-start last-input-event)))
-          (and (not mouse-1-click-in-non-selected-windows)
-               (not (eq (selected-window)
-                        (posn-window (event-start last-input-event))))))
-      nil
+  (when (and mouse-1-click-follows-link
+             (eq (if (eq mouse-1-click-follows-link 'double)
+                     'double-down-mouse-1 'down-mouse-1)
+                 (car-safe last-input-event))
+             (mouse-on-link-p (event-start last-input-event))
+             (or mouse-1-click-in-non-selected-windows
+                 (eq (selected-window)
+                     (posn-window (event-start last-input-event)))))
     (let ((this-event last-input-event)
           (timedout
            (sit-for (if (numberp mouse-1-click-follows-link)