; * lisp/touch-screen.el (touch-screen-handle-touch): Correct typo.

diff --git a/lisp/touch-screen.el b/lisp/touch-screen.el
index 72e22cfd79c5a2e04cc3412336382b9af3e79efd..f6a47e69d8147e9a7f9c72f231e83d8e471f3fd3 100644 (file)
--- 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.