Commit 51176ee8 authored by Juri Linkov's avatar Juri Linkov

* lisp/emacs-lisp/map-ynp.el (read-answer): Allow more SHORT-ANSWER types.

Treat SHORT-ANSWER as a character is characterp returns non-nil.
Otherwise, use key-description to print it.
Use catch-all [t] in keymap instead of [remap self-insert-command].
(bug#32738)
parent 7c2c24a1
Pipeline #4275 failed with stage
in 59 minutes and 54 seconds
......@@ -255,6 +255,10 @@ The default value is 30000, as the previously hard-coded threshold.
+++
** The function 'read-passwd' uses "*" as default character to hide passwords.
** The function 'read-answer' now accepts not only single character
answers, but also function keys like F1, character events such as C-M-h,
and control characters like C-h.
** Lexical binding is now used when evaluating interactive Elisp forms.
More specifically, lexical-binding is now used for 'M-:', '--eval', as
well as in the "*scratch*" and "*ielm*" buffers.
......
......@@ -287,6 +287,10 @@ where
SHORT-ANSWER is an abbreviated one-character answer,
HELP-MESSAGE is a string describing the meaning of the answer.
SHORT-ANSWER is not necessarily a single character answer. It can be
also a function key like F1, a character event such as C-M-h, or
a control character like C-h.
Example:
\\='((\"yes\" ?y \"perform the action\")
(\"no\" ?n \"skip to the next\")
......@@ -312,14 +316,18 @@ When `use-dialog-box' is t, pop up a dialog window to get user input."
(format "%s(%s) " question
(mapconcat (lambda (a)
(if short
(format "%c" (nth 1 a))
(if (characterp (nth 1 a))
(format "%c" (nth 1 a))
(key-description (nth 1 a)))
(nth 0 a)))
answers-with-help ", ")))
(message
(format "Please answer %s."
(mapconcat (lambda (a)
(format "`%s'" (if short
(string (nth 1 a))
(if (characterp (nth 1 a))
(string (nth 1 a))
(key-description (nth 1 a)))
(nth 0 a))))
answers-with-help " or ")))
(short-answer-map
......@@ -329,13 +337,15 @@ When `use-dialog-box' is t, pop up a dialog window to get user input."
(let ((map (make-sparse-keymap)))
(set-keymap-parent map minibuffer-local-map)
(dolist (a answers-with-help)
(define-key map (vector (nth 1 a))
(define-key map (if (characterp (nth 1 a))
(vector (nth 1 a))
(nth 1 a))
(lambda ()
(interactive)
(delete-minibuffer-contents)
(insert (nth 0 a))
(exit-minibuffer))))
(define-key map [remap self-insert-command]
(define-key map [t]
(lambda ()
(interactive)
(delete-minibuffer-contents)
......@@ -374,7 +384,10 @@ When `use-dialog-box' is t, pop up a dialog window to get user input."
(mapconcat
(lambda (a)
(format "`%s'%s to %s"
(if short (string (nth 1 a)) (nth 0 a))
(if short (if (characterp (nth 1 a))
(string (nth 1 a))
(key-description (nth 1 a)))
(nth 0 a))
(if short (format " (%s)" (nth 0 a)) "")
(nth 2 a)))
answers-with-help ",\n")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment