summaryrefslogtreecommitdiff
path: root/lisp/subr.el
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2025-03-12 10:09:09 +0800
committerSean Whitton <spwhitton@spwhitton.name>2025-03-12 10:09:09 +0800
commit99852fb867e4d7d2090cbb82ff12d86d2a6ed9cc (patch)
tree7d597de0644e89ee082f7d4c324a250d19cf4e88 /lisp/subr.el
parent85b147d32100d8da89366a19ab77f996fe011043 (diff)
parent894b0e3a2fe064690eecda546f3b577886638140 (diff)
downloademacs-99852fb867e4d7d2090cbb82ff12d86d2a6ed9cc.tar.gz
emacs-99852fb867e4d7d2090cbb82ff12d86d2a6ed9cc.tar.bz2
emacs-99852fb867e4d7d2090cbb82ff12d86d2a6ed9cc.zip
Merge from origin/emacs-30
894b0e3a2fe ; Adapt comment in tramp.el cc87717fa07 Add keyword placeholder to tramp.el 7d0d61d8549 Rewrite ERT manual introduction b2f124f2a88 ; cperl-mode.el: Don't misinterpret exec_fcn as keyword exec 59d1aac49df Document return values of the various read-* functions
Diffstat (limited to 'lisp/subr.el')
-rw-r--r--lisp/subr.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/subr.el b/lisp/subr.el
index 932a22d3250..c027fea5caa 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3409,7 +3409,7 @@ miscellaneous values associated with the process."
(defvar read-key-delay 0.01) ;Fast enough for 100Hz repeat rate, hopefully.
(defun read-key (&optional prompt disable-fallbacks)
- "Read a key from the keyboard.
+ "Read a key from the keyboard, return the event thus read.
Contrary to `read-event' this will not return a raw event but instead will
obey the input decoding and translations usually done by `read-key-sequence'.
So escape sequences and keyboard encoding are taken into account.
@@ -3531,7 +3531,7 @@ with Emacs. Do not call it directly in your own packages."
"The default history for the `read-number' function.")
(defun read-number (prompt &optional default hist)
- "Read a numeric value in the minibuffer, prompting with PROMPT.
+ "Read from the minibuffer and return a numeric value, prompting with PROMPT.
DEFAULT specifies a default value to return if the user just types RET.
For historical reasons, the value of DEFAULT is always inserted into
PROMPT, so it's recommended to use `format' instead of `format-prompt'