diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-21 16:11:22 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-21 16:11:22 -0400 |
| commit | 18b8557f5ab154625d72891bdb982da14091da4d (patch) | |
| tree | 80e9d83266e4e3735033ce8c0919fe3d795f20b8 /lisp/xt-mouse.el | |
| parent | be5722e930b71fbbca049bd924b0b2f6dafa72b4 (diff) | |
| download | emacs-18b8557f5ab154625d72891bdb982da14091da4d.tar.gz | |
* lisp/mouse.el (mouse-drag-line): Use set-transient-map.
(mouse--down-1-maybe-follows-link): Remove unused var `this-event'.
(mouse-yank-secondary): Use gui-get-selection.
(mouse--down-1-maybe-follows-link): Use read-key.
* lisp/subr.el (read-key): Fix clicks on the mode-line.
(set-transient-map): Return exit function.
* lisp/xt-mouse.el: Add `event-kind' property on the fly from
xterm-mouse-translate-1 rather than statically at the outset.
Fixes: debbugs:18015
Diffstat (limited to 'lisp/xt-mouse.el')
| -rw-r--r-- | lisp/xt-mouse.el | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el index cad3151b244..b933936f128 100644 --- a/lisp/xt-mouse.el +++ b/lisp/xt-mouse.el @@ -42,13 +42,6 @@ (defvar xterm-mouse-debug-buffer nil) -;; Mouse events symbols must have an 'event-kind property with -;; the value 'mouse-click. -(dolist (event '(mouse-1 mouse-2 mouse-3 mouse-4 mouse-5)) - (let ((M-event (intern (concat "M-" (symbol-name event))))) - (put event 'event-kind 'mouse-click) - (put M-event 'event-kind 'mouse-click))) - (defun xterm-mouse-translate (_event) "Read a click and release event from XTerm." (xterm-mouse-translate-1)) @@ -69,6 +62,10 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)." (vec (vector event)) (is-down (string-match "down-" (symbol-name ev-command)))) + ;; Mouse events symbols must have an 'event-kind property with + ;; the value 'mouse-click. + (when ev-command (put ev-command 'event-kind 'mouse-click)) + (cond ((null event) nil) ;Unknown/bogus byte sequence! (is-down |