Commit 87eb576e authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/info.el (Info-mode-map): Override a global down-mouse-2 binding.

Fixes: debbugs:18212
parent 8db811ef
2014-08-07 Stefan Monnier <monnier@iro.umontreal.ca>
* info.el (Info-mode-map): Override a global down-mouse-2 binding
(bug#18212).
2014-08-05 Eli Zaretskii <eliz@gnu.org> 2014-08-05 Eli Zaretskii <eliz@gnu.org>
   
* simple.el (default-line-height): A floating-point value of * simple.el (default-line-height): A floating-point value of
line-spacing means a fraction of the default frame font's height, line-spacing means a fraction of the default frame font's height,
not of the font currently used by the 'default' face. Truncate not of the font currently used by the 'default' face.
the pixel value, like the display engine does. Truncate the pixel value, like the display engine does.
(window-screen-lines): Use window-inside-pixel-edges for (window-screen-lines): Use window-inside-pixel-edges for
determining the window height in pixels. (Bug#18195) determining the window height in pixels. (Bug#18195)
   
...@@ -105,8 +110,8 @@ ...@@ -105,8 +110,8 @@
2014-07-19 Fabián Ezequiel Gallina <fgallina@gnu.org> 2014-07-19 Fabián Ezequiel Gallina <fgallina@gnu.org>
   
Fix Python shell prompts detection for remote hosts. Fix Python shell prompts detection for remote hosts.
* progmodes/python.el (python-shell-prompt-detect): Replace * progmodes/python.el (python-shell-prompt-detect):
call-process with process-file and make it more robust. Replace call-process with process-file and make it more robust.
   
2014-07-17 Fabián Ezequiel Gallina <fgallina@gnu.org> 2014-07-17 Fabián Ezequiel Gallina <fgallina@gnu.org>
   
......
...@@ -3994,6 +3994,7 @@ If FORK is non-nil, it is passed to `Info-goto-node'." ...@@ -3994,6 +3994,7 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
(define-key map "," 'Info-index-next) (define-key map "," 'Info-index-next)
(define-key map "\177" 'Info-scroll-down) (define-key map "\177" 'Info-scroll-down)
(define-key map [mouse-2] 'Info-mouse-follow-nearest-node) (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 [follow-link] 'mouse-face)
(define-key map [XF86Back] 'Info-history-back) (define-key map [XF86Back] 'Info-history-back)
(define-key map [XF86Forward] 'Info-history-forward) (define-key map [XF86Forward] 'Info-history-forward)
......
...@@ -94,15 +94,14 @@ point at the click position." ...@@ -94,15 +94,14 @@ point at the click position."
(defun mouse--down-1-maybe-follows-link (&optional _prompt) (defun mouse--down-1-maybe-follows-link (&optional _prompt)
"Turn `mouse-1' events into `mouse-2' events if follows-link. "Turn `mouse-1' events into `mouse-2' events if follows-link.
Expects to be bound to `down-mouse-1' in `key-translation-map'." Expects to be bound to `down-mouse-1' in `key-translation-map'."
(if (or (null mouse-1-click-follows-link) (when (and mouse-1-click-follows-link
(not (eq (if (eq mouse-1-click-follows-link 'double) (eq (if (eq mouse-1-click-follows-link 'double)
'double-down-mouse-1 'down-mouse-1) 'double-down-mouse-1 'down-mouse-1)
(car-safe last-input-event))) (car-safe last-input-event))
(not (mouse-on-link-p (event-start last-input-event))) (mouse-on-link-p (event-start last-input-event))
(and (not mouse-1-click-in-non-selected-windows) (or mouse-1-click-in-non-selected-windows
(not (eq (selected-window) (eq (selected-window)
(posn-window (event-start last-input-event)))))) (posn-window (event-start last-input-event)))))
nil
(let ((this-event last-input-event) (let ((this-event last-input-event)
(timedout (timedout
(sit-for (if (numberp mouse-1-click-follows-link) (sit-for (if (numberp mouse-1-click-follows-link)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment