From: Andrea Corallo <acorallo@gnu.org>
Date: Mon, 17 Jun 2024 13:38:37 +0000 (+0200)
Subject: * lisp/touch-screen.el (touch-screen-inhibit-drag): Fix 'not' arity use.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a084dc63fd4b7278e6ce9ceaaba37f9778069888;p=emacs.git

* lisp/touch-screen.el (touch-screen-inhibit-drag): Fix 'not' arity use.

(cherry picked from commit a5a374014f3afe0d6b94bf645c6cf886c6564699)
---

diff --git a/lisp/touch-screen.el b/lisp/touch-screen.el
index dd6bbf8ccce..8b917573bee 100644
--- a/lisp/touch-screen.el
+++ b/lisp/touch-screen.el
@@ -2065,9 +2065,9 @@ Must be called from a command bound to a `touchscreen-hold' or
 `touchscreen-drag' event."
   (let* ((tool touch-screen-current-tool)
          (current-what (nth 4 tool)))
-    ;; Signal an error if no hold or drag is in progress.
-    (when (and (not (eq current-what 'hold)
-                    (eq current-what 'drag)))
+    ;; Signal an error if no hold and no drag is in progress.
+    (when (and (not (eq current-what 'hold))
+               (not (eq current-what 'drag)))
       (error "Calling `touch-screen-inhibit-drag' outside hold or drag"))
     ;; Now set the fourth element of tool to `command-inhibit'.
     (setcar (nthcdr 3 tool) 'command-inhibit)))