diff options
| author | Eli Zaretskii | 2024-12-28 08:30:31 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2024-12-28 08:30:31 -0500 |
| commit | af3bbc83600bec6c8621e1b04437dbfdeb329106 (patch) | |
| tree | 9e981a7cdd60b276ae0e6549a4277f1995708d38 /src | |
| parent | ad5c8f25b36aac71870ff26b6549014c452a2145 (diff) | |
| parent | 2ba6387d1d63072c5faaa7798c8ef7b00ca883c3 (diff) | |
| download | emacs-af3bbc83600bec6c8621e1b04437dbfdeb329106.tar.gz emacs-af3bbc83600bec6c8621e1b04437dbfdeb329106.zip | |
Merge from origin/emacs-30
2ba6387d1d6 ; Fix inaccuracy in ELisp Reference manual
8ac6a178804 ; * etc/PROBLEMS: Mention problems with XPM support in GD...
624322d5f6a Add missing fontification matches for elixir-ts-mode
5bafb11b400 ; Fix copyright year
186ea407326 Don't start docstrings with "This function" or similar
cb8ce2e68bb Enable indent-tabs-mode in obj-c-mode
54f35137096 Fix comment indent in 'lua-ts-mode' and old grammar
8b95549e908 * admin/nt/dist-build/build-dep-zips.py: (deps src) handl...
8064b2a6798 Document undocumented completion commands
c29b798537e ; etc/w32-feature.el (harfbuzz): improve test
0e43e35f96e * admin/nt/dist-build/emacs.nsi: (Uninstall) delete only ...
b83cd8a8fb0 ; * etc/tutorials/TUTORIAL.ko: Fix the beginning.
41caccc488b ; * etc/publicsuffix.txt: Update from upstream.
e6fb18406ee ; Fix refcards
14e791f9ba2 ; Update acknowledgments for Emacs 30
861b7864fc4 ; Fix node name in emacs-lisp-intro.texi
77243ba5be8 ; Update version tags of defcustoms
fe2ac33bae8 ;* doc/misc/efaq.texi (New in Emacs 30): Mention 'trusted...
8fb884f0dc0 ; * etc/NEWS: Fix wording.
e281355a5e8 Improve D-Bus and Tramp manual
# Conflicts:
# doc/emacs/emacs.texi
# etc/NEWS
# lisp/erc/erc-log.el
# lisp/eshell/esh-mode.el
# lisp/which-key.el
Diffstat (limited to 'src')
| -rw-r--r-- | src/minibuf.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index e50913a013f..5095e198fef 100644 --- a/src/minibuf.c +++ b/src/minibuf.c | |||
| @@ -1297,6 +1297,11 @@ barf_if_interaction_inhibited (void) | |||
| 1297 | DEFUN ("read-from-minibuffer", Fread_from_minibuffer, | 1297 | DEFUN ("read-from-minibuffer", Fread_from_minibuffer, |
| 1298 | Sread_from_minibuffer, 1, 7, 0, | 1298 | Sread_from_minibuffer, 1, 7, 0, |
| 1299 | doc: /* Read a string from the minibuffer, prompting with string PROMPT. | 1299 | doc: /* Read a string from the minibuffer, prompting with string PROMPT. |
| 1300 | While in the minibuffer, you can use \\<minibuffer-local-completion-map>\\[minibuffer-complete] and \\[minibuffer-complete-word] to complete your input. | ||
| 1301 | You can also use \\<minibuffer-local-map>\\[minibuffer-complete-history] to complete using history items in the | ||
| 1302 | input history HIST, and you can use \\[minibuffer-complete-defaults] to complete using | ||
| 1303 | the default items in DEFAULT-VALUE. | ||
| 1304 | |||
| 1300 | The optional second arg INITIAL-CONTENTS is an obsolete alternative to | 1305 | The optional second arg INITIAL-CONTENTS is an obsolete alternative to |
| 1301 | DEFAULT-VALUE. It normally should be nil in new code, except when | 1306 | DEFAULT-VALUE. It normally should be nil in new code, except when |
| 1302 | HIST is a cons. It is discussed in more detail below. | 1307 | HIST is a cons. It is discussed in more detail below. |