1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-17 03:10:58 -08:00

Merge branch 'master' into scratch/igc

This commit is contained in:
Pip Cet 2024-07-10 13:01:42 +00:00
commit 2a34ced4cd
378 changed files with 6547 additions and 3703 deletions

View file

@ -182,6 +182,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
@ -228,7 +231,10 @@ Usage example:
(when (setq command
(let ((current-key-remap-sequence
(vector tchar)))
(touch-screen-translate-touch nil)))
;; Provide an empty prompt 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))
@ -243,9 +249,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)