diff options
| author | Po Lu | 2024-06-25 12:53:33 +0800 |
|---|---|---|
| committer | Po Lu | 2024-06-25 12:53:33 +0800 |
| commit | b9da5ee06f2e4ae807336dd6a641ae797831d097 (patch) | |
| tree | ebb617f3f5d442cf30d6319e8cff019f08236247 | |
| parent | be0d57f7ed94cb7a4a9e0764d1993420f6e31fbe (diff) | |
| parent | 60b38c317bbd8e6020442a5c0efe504a22eaa092 (diff) | |
| download | emacs-b9da5ee06f2e4ae807336dd6a641ae797831d097.tar.gz emacs-b9da5ee06f2e4ae807336dd6a641ae797831d097.zip | |
Merge from savannah/emacs-30
60b38c317bb * lisp/touch-screen.el (touch-screen-inhibit-drag): Anoth...
| -rw-r--r-- | lisp/touch-screen.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/touch-screen.el b/lisp/touch-screen.el index aa4bded8975..c5918efb800 100644 --- a/lisp/touch-screen.el +++ b/lisp/touch-screen.el | |||
| @@ -2067,7 +2067,7 @@ Must be called from a command bound to a `touchscreen-hold' or | |||
| 2067 | (let* ((tool touch-screen-current-tool) | 2067 | (let* ((tool touch-screen-current-tool) |
| 2068 | (current-what (nth 3 tool))) | 2068 | (current-what (nth 3 tool))) |
| 2069 | ;; Signal an error if no hold and no drag is in progress. | 2069 | ;; Signal an error if no hold and no drag is in progress. |
| 2070 | (when (and (not (eq current-what 'hold)) | 2070 | (when (and (not (eq current-what 'held)) |
| 2071 | (not (eq current-what 'drag))) | 2071 | (not (eq current-what 'drag))) |
| 2072 | (error "Calling `touch-screen-inhibit-drag' outside hold or drag")) | 2072 | (error "Calling `touch-screen-inhibit-drag' outside hold or drag")) |
| 2073 | ;; Now set the fourth element of tool to `command-inhibit'. | 2073 | ;; Now set the fourth element of tool to `command-inhibit'. |