[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master f50e54c01e8: ; * lisp/touch-screen.el (touch-screen-handle-touch)
From: |
Po Lu |
Subject: |
master f50e54c01e8: ; * lisp/touch-screen.el (touch-screen-handle-touch): Correct typo. |
Date: |
Tue, 21 Nov 2023 22:27:00 -0500 (EST) |
branch: master
commit f50e54c01e84323e2689d79864dd9d65974d4429
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
; * lisp/touch-screen.el (touch-screen-handle-touch): Correct typo.
---
lisp/touch-screen.el | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/lisp/touch-screen.el b/lisp/touch-screen.el
index 72e22cfd79c..f6a47e69d81 100644
--- a/lisp/touch-screen.el
+++ b/lisp/touch-screen.el
@@ -1662,20 +1662,22 @@ the place of EVENT within the key sequence being
translated, or
(when touch-screen-current-timer
(cancel-timer touch-screen-current-timer)
(setq touch-screen-current-timer nil))
- (unwind-protect
- ;; Don't perform any actions associated with releasing the
- ;; tool if the touch sequence was intercepted by another
- ;; program.
- (unless (caddr event)
- (touch-screen-handle-point-up (cadr event) prefix))
- ;; If an ancillary tool is present the function call above
- ;; will merely transfer information from it into the current
- ;; tool list, thereby rendering it the new current tool,
- ;; until such time as it too is released.
- (if (or (caddr event) touch-screen-aux-tool)
- ;; Make sure the tool list is cleared even if
- ;; `touch-screen-handle-point-up' throws.
- (setq touch-screen-current-tool nil))))
+ (let ((old-aux-tool touch-screen-aux-tool))
+ (unwind-protect
+ ;; Don't perform any actions associated with releasing the
+ ;; tool if the touch sequence was intercepted by another
+ ;; program.
+ (if (caddr event)
+ (setq touch-screen-current-tool nil)
+ (touch-screen-handle-point-up (cadr event) prefix))
+ ;; If an ancillary tool is present the function call above
+ ;; will merely transfer information from it into the current
+ ;; tool list, thereby rendering it the new current tool,
+ ;; until such time as it too is released.
+ (when (not (and old-aux-tool (not touch-screen-aux-tool)))
+ ;; 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
;; further action is required, for the next update received will
;; resume regular gesture recognition.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master f50e54c01e8: ; * lisp/touch-screen.el (touch-screen-handle-touch): Correct typo.,
Po Lu <=