summaryrefslogtreecommitdiff
path: root/lisp/mouse.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2014-08-07 14:35:54 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2014-08-07 14:35:54 -0400
commit87eb576e30481ddf4d8daec020f8f78a62c02a2c (patch)
treef09f63cb5d68f1794c314263811265d9fd7f6c7d /lisp/mouse.el
parent8db811eff1b890cfc12e065d86a9f93bf974e364 (diff)
downloademacs-87eb576e30481ddf4d8daec020f8f78a62c02a2c.tar.gz
* lisp/info.el (Info-mode-map): Override a global down-mouse-2 binding.
Fixes: debbugs:18212
Diffstat (limited to 'lisp/mouse.el')
-rw-r--r--lisp/mouse.el17
1 files changed, 8 insertions, 9 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el
index ce691748cac..1cbff687c64 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -94,15 +94,14 @@ point at the click position."
(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)