diff options
| author | Po Lu <luangruo@yahoo.com> | 2024-06-28 14:46:58 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2024-06-28 14:46:58 +0800 |
| commit | 48f9dde1331e1c4af1856efd41886e655d670d19 (patch) | |
| tree | 793a552260f2673acf940020781a8d96177c945c /lisp/emacs-lisp | |
| parent | dd40bf6bbbeae7bc59a4f1d425bf9a214623e766 (diff) | |
| parent | c4ec905c9a9b68e99f5abf208be53c981cd718eb (diff) | |
| download | emacs-48f9dde1331e1c4af1856efd41886e655d670d19.tar.gz emacs-48f9dde1331e1c4af1856efd41886e655d670d19.tar.bz2 emacs-48f9dde1331e1c4af1856efd41886e655d670d19.zip | |
Merge from savannah/emacs-30
c4ec905c9a9 Correct ommissions in rmc.el
bf862fc2770 * lisp/hi-lock.el: More fixes related to revert-buffer.
6cc8ffae9a6 Update to Org 9.7.5-9-ga091ca
c477443ab80 ; Fix typo in lua-ts-mode.el
6e5e4d61939 ; Add 'eglot-ensure' option to 'lua-ts-mode-hook'
58a2f36a8b9 ; * etc/NEWS: Copy edit.
df53ef176ac Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
039e6ffd866 Write Antinews for Emacs 30 ELisp Reference
bf8c9f702ba (eval-last-sexp): Fix bug#71774
6d94090cadc * lisp/hi-lock.el: More fixes for revert-buffer (bug#57534)
280c91782af * lisp/hi-lock.el (hi-lock-revert-buffer-rehighlight): Im...
339310d0205 * lisp/tab-bar.el (tab-bar-select-restore-windows): Impro...
c1e7569a925 Write Antinews for Emacs 30 user manual
233f683da8f ; * lisp/erc/erc-backend.el (erc-server-reconnect-timeout...
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/rmc.el | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/rmc.el b/lisp/emacs-lisp/rmc.el index 883f8bf187f..dab119e8a99 100644 --- a/lisp/emacs-lisp/rmc.el +++ b/lisp/emacs-lisp/rmc.el @@ -179,6 +179,9 @@ Usage example: (read-multiple-choice--short-answers prompt choices help-string show-help))) +(declare-function touch-screen-scroll "touch-screen.el") +(declare-function touch-screen-pinch "touch-screen.el") + (defun read-multiple-choice--short-answers (prompt choices help-string show-help) (let* ((dialog-p (use-dialog-box-p)) (prompt-choices @@ -225,7 +228,11 @@ Usage example: (when (setq command (let ((current-key-remap-sequence (vector tchar))) - (touch-screen-translate-touch nil))) + ;; Provide an empty prompt to `t-s-t-t' so + ;; that it may not repeatedly display + ;; and/or disable the on-screen keyboard, + ;; or move point. + (touch-screen-translate-touch ""))) (setq command (if (> (length command) 0) (aref command 0) nil)) @@ -240,9 +247,9 @@ Usage example: ;; Respond to scroll and pinch events as if RMC were ;; not in progress. ((eq (car-safe command) 'touchscreen-scroll) - (funcall #'touch-screen-scroll command)) + (touch-screen-scroll command)) ((eq (car-safe command) 'touchscreen-pinch) - (funcall #'touch-screen-pinch command)) + (touch-screen-pinch command)) ;; Prevent other touchscreen-generated events from ;; reaching the default conditional. ((memq (or (and (symbolp command) command) |