diff options
| author | Stefan Monnier | 2014-08-07 14:35:54 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-08-07 14:35:54 -0400 |
| commit | 87eb576e30481ddf4d8daec020f8f78a62c02a2c (patch) | |
| tree | f09f63cb5d68f1794c314263811265d9fd7f6c7d /lisp/mouse.el | |
| parent | 8db811eff1b890cfc12e065d86a9f93bf974e364 (diff) | |
| download | emacs-87eb576e30481ddf4d8daec020f8f78a62c02a2c.tar.gz emacs-87eb576e30481ddf4d8daec020f8f78a62c02a2c.zip | |
* 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.el | 17 |
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." | |||
| 94 | (defun mouse--down-1-maybe-follows-link (&optional _prompt) | 94 | (defun mouse--down-1-maybe-follows-link (&optional _prompt) |
| 95 | "Turn `mouse-1' events into `mouse-2' events if follows-link. | 95 | "Turn `mouse-1' events into `mouse-2' events if follows-link. |
| 96 | Expects to be bound to `down-mouse-1' in `key-translation-map'." | 96 | Expects to be bound to `down-mouse-1' in `key-translation-map'." |
| 97 | (if (or (null mouse-1-click-follows-link) | 97 | (when (and mouse-1-click-follows-link |
| 98 | (not (eq (if (eq mouse-1-click-follows-link 'double) | 98 | (eq (if (eq mouse-1-click-follows-link 'double) |
| 99 | 'double-down-mouse-1 'down-mouse-1) | 99 | 'double-down-mouse-1 'down-mouse-1) |
| 100 | (car-safe last-input-event))) | 100 | (car-safe last-input-event)) |
| 101 | (not (mouse-on-link-p (event-start last-input-event))) | 101 | (mouse-on-link-p (event-start last-input-event)) |
| 102 | (and (not mouse-1-click-in-non-selected-windows) | 102 | (or mouse-1-click-in-non-selected-windows |
| 103 | (not (eq (selected-window) | 103 | (eq (selected-window) |
| 104 | (posn-window (event-start last-input-event)))))) | 104 | (posn-window (event-start last-input-event))))) |
| 105 | nil | ||
| 106 | (let ((this-event last-input-event) | 105 | (let ((this-event last-input-event) |
| 107 | (timedout | 106 | (timedout |
| 108 | (sit-for (if (numberp mouse-1-click-follows-link) | 107 | (sit-for (if (numberp mouse-1-click-follows-link) |