summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2022-08-15 06:30:29 +0200
committerStefan Kangas <stefan@marxist.se>2022-08-15 06:30:29 +0200
commit75372c6c4e356d01ffa3a839cf65244dca3a909c (patch)
tree1042a914da91917f45d737e25d3044cf91d8598a
parent4bee89b73fb105ae28d72abbf4dbdedb4b77e11f (diff)
parent9d0dba44da7ac83d018fff3c26d33dac12ebd806 (diff)
downloademacs-75372c6c4e356d01ffa3a839cf65244dca3a909c.tar.gz
Merge from origin/emacs-28
9d0dba44da ; * doc/lispintro/emacs-lisp-intro.texi: Fix typo. 0e336fa51f ; Improve documentation of minibuffer history wrt completion
-rw-r--r--doc/emacs/mini.texi13
-rw-r--r--doc/lispintro/emacs-lisp-intro.texi2
2 files changed, 9 insertions, 6 deletions
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index 4e71793b66e..e71d653210a 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -734,11 +734,14 @@ highlighting. This feature uses the special text property
@section Minibuffer History
@cindex minibuffer history
@cindex history of minibuffer input
-
- Every argument that you enter with the minibuffer is saved in a
-@dfn{minibuffer history list} so you can easily use it again later.
-You can use the following arguments to quickly fetch an earlier
-argument into the minibuffer:
+@cindex completion, walking through candidates
+
+ Everything you type in the minibuffer is saved in a @dfn{minibuffer
+history list} so you can easily use it again later. This includes
+completion candidates (such as file names, buffer names, command
+names, etc.@:) and any other kind of minibuffer input. You can use
+the following commands to quickly fetch an earlier or alternative
+response into the minibuffer:
@table @kbd
@item M-p
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 47a5a870fde..e00edeb392b 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -14808,7 +14808,7 @@ symbols in one function definition."
(setq lengths-list
(cons (count-words-in-defun) lengths-list)))
(kill-buffer buffer)
- lengths-list)))
+ lengths-list))))
@end group
@end smallexample