summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/rmc.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-06-02 10:25:50 -0700
committerGlenn Morris <rgm@gnu.org>2018-06-02 10:25:50 -0700
commit42a851c6347bb45a2fb8acdb0d2a1ca468ecefd3 (patch)
treebfd595460df8864956639fecc13636a94d413212 /lisp/emacs-lisp/rmc.el
parent4a7e74fea687011ee81dcbb02294bccd99b3a05f (diff)
parentca3f0a8343c125a44845d21808ab0e35b87533db (diff)
downloademacs-42a851c6347bb45a2fb8acdb0d2a1ca468ecefd3.tar.gz
emacs-42a851c6347bb45a2fb8acdb0d2a1ca468ecefd3.tar.bz2
emacs-42a851c6347bb45a2fb8acdb0d2a1ca468ecefd3.zip
Merge from origin/emacs-26
ca3f0a8 ; * etc/NEWS: Belated announcement of 2 changes made in Emacs... 99f92da Improve documentation of 'directory-files-and-attributes' df8649a * lisp/gnus/message.el (message-remove-header): Don't remove ... b682a7e ; * etc/NEWS: Add headings for Emacs 26.2 aa175a4 Adapt hexl-mode to native line-number display b8e7749 Fix example in Tramp manual f212fe5 Handle case where Xft is found but not XRender 186280f * doc/misc/tramp.texi (Frequently Asked Questions): Adapt zsh... 24ba633 Improve read-multiple-choice docstring (Bug#31628) Conflicts: etc/NEWS src/dired.c
Diffstat (limited to 'lisp/emacs-lisp/rmc.el')
-rw-r--r--lisp/emacs-lisp/rmc.el18
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/emacs-lisp/rmc.el b/lisp/emacs-lisp/rmc.el
index 3dd3508903a..31974782b53 100644
--- a/lisp/emacs-lisp/rmc.el
+++ b/lisp/emacs-lisp/rmc.el
@@ -30,12 +30,12 @@
"Ask user a multiple choice question.
PROMPT should be a string that will be displayed as the prompt.
-CHOICES is an alist where the first element in each entry is a
-character to be entered, the second element is a short name for
-the entry to be displayed while prompting (if there's room, it
-might be shortened), and the third, optional entry is a longer
-explanation that will be displayed in a help buffer if the user
-requests more help.
+CHOICES is a list of (KEY NAME [DESCRIPTION]). KEY is a
+character to be entered. NAME is a short name for the entry to
+be displayed while prompting (if there's room, it might be
+shortened). DESCRIPTION is an optional longer explanation that
+will be displayed in a help buffer if the user requests more
+help.
This function translates user input into responses by consulting
the bindings in `query-replace-map'; see the documentation of
@@ -46,9 +46,9 @@ perform the requested window recentering or scrolling and ask
again.
When `use-dialog-box' is t (the default), this function can pop
-up a dialog window to collect the user input. That functionality
-requires `display-popup-menus-p' to return t. Otherwise, a text
-dialog will be used.
+up a dialog window to collect the user input. That functionality
+requires `display-popup-menus-p' to return t. Otherwise, a
+text dialog will be used.
The return value is the matching entry from the CHOICES list.