emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-30 ee61b9a050b: ; Fix documentation of completion commands


From: Eli Zaretskii
Subject: emacs-30 ee61b9a050b: ; Fix documentation of completion commands
Date: Sat, 11 Jan 2025 05:41:52 -0500 (EST)

branch: emacs-30
commit ee61b9a050b4fbc9940d11bc95437e5113865c8b
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    ; Fix documentation of completion commands
    
    * src/minibuf.c (Fcompleting_read): Move part of doc string of
    'read-from-minibuffer' to doc string of this function.  Suggested
    by Eshel Yaron <me@eshelyaron.com>.
---
 src/minibuf.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/minibuf.c b/src/minibuf.c
index e0d060a0480..bf9fad48d88 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1293,11 +1293,6 @@ barf_if_interaction_inhibited (void)
 DEFUN ("read-from-minibuffer", Fread_from_minibuffer,
        Sread_from_minibuffer, 1, 7, 0,
        doc: /* Read a string from the minibuffer, prompting with string PROMPT.
-While in the minibuffer, you can use 
\\<minibuffer-local-completion-map>\\[minibuffer-complete] and 
\\[minibuffer-complete-word] to complete your input.
-You can also use \\<minibuffer-local-map>\\[minibuffer-complete-history] to 
complete using history items in the
-input history HIST, and you can use \\[minibuffer-complete-defaults] to 
complete using
-the default items in DEFAULT-VALUE.
-
 The optional second arg INITIAL-CONTENTS is an obsolete alternative to
   DEFAULT-VALUE.  It normally should be nil in new code, except when
   HIST is a cons.  It is discussed in more detail below.
@@ -1983,6 +1978,11 @@ with a space are ignored unless STRING itself starts 
with a space.  */)
 
 DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0,
        doc: /* Read a string in the minibuffer, with completion.
+While in the minibuffer, you can use 
\\<minibuffer-local-completion-map>\\[minibuffer-complete] and 
\\[minibuffer-complete-word] to complete your input.
+You can also use \\<minibuffer-local-map>\\[minibuffer-complete-history] to 
complete using history items in the
+input history HIST, and you can use \\[minibuffer-complete-defaults] to 
complete using
+the default items in DEFAULT-VALUE.
+
 PROMPT is a string to prompt with; normally it ends in a colon and a space.
 COLLECTION can be a list of strings, an alist, an obarray or a hash table.
 COLLECTION can also be a function to do the completion itself.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]