summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/rmc.el13
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)