mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
; * lisp/touch-screen.el (touch-screen-handle-touch): Correct typo.
This commit is contained in:
parent
148250f074
commit
f50e54c01e
1 changed files with 16 additions and 14 deletions
|
|
@ -1662,20 +1662,22 @@ the place of EVENT within the key sequence being translated, or
|
||||||
(when touch-screen-current-timer
|
(when touch-screen-current-timer
|
||||||
(cancel-timer touch-screen-current-timer)
|
(cancel-timer touch-screen-current-timer)
|
||||||
(setq touch-screen-current-timer nil))
|
(setq touch-screen-current-timer nil))
|
||||||
(unwind-protect
|
(let ((old-aux-tool touch-screen-aux-tool))
|
||||||
;; Don't perform any actions associated with releasing the
|
(unwind-protect
|
||||||
;; tool if the touch sequence was intercepted by another
|
;; Don't perform any actions associated with releasing the
|
||||||
;; program.
|
;; tool if the touch sequence was intercepted by another
|
||||||
(unless (caddr event)
|
;; program.
|
||||||
(touch-screen-handle-point-up (cadr event) prefix))
|
(if (caddr event)
|
||||||
;; If an ancillary tool is present the function call above
|
(setq touch-screen-current-tool nil)
|
||||||
;; will merely transfer information from it into the current
|
(touch-screen-handle-point-up (cadr event) prefix))
|
||||||
;; tool list, thereby rendering it the new current tool,
|
;; If an ancillary tool is present the function call above
|
||||||
;; until such time as it too is released.
|
;; will merely transfer information from it into the current
|
||||||
(if (or (caddr event) touch-screen-aux-tool)
|
;; tool list, thereby rendering it the new current tool,
|
||||||
;; Make sure the tool list is cleared even if
|
;; until such time as it too is released.
|
||||||
;; `touch-screen-handle-point-up' throws.
|
(when (not (and old-aux-tool (not touch-screen-aux-tool)))
|
||||||
(setq touch-screen-current-tool nil))))
|
;; Make sure the tool list is cleared even if
|
||||||
|
;; `touch-screen-handle-point-up' throws.
|
||||||
|
(setq touch-screen-current-tool nil)))))
|
||||||
;; If it is rather the ancillary tool, delete its vector. No
|
;; If it is rather the ancillary tool, delete its vector. No
|
||||||
;; further action is required, for the next update received will
|
;; further action is required, for the next update received will
|
||||||
;; resume regular gesture recognition.
|
;; resume regular gesture recognition.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue