master 75372c6c4e: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 75372c6c4e356d01ffa3a839cf65244dca3a909c
Merge: 4bee89b73f 9d0dba44da
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    9d0dba44da ; * doc/lispintro/emacs-lisp-intro.texi: Fix typo.
    0e336fa51f ; Improve documentation of minibuffer history wrt completion
---
 doc/emacs/mini.texi                 | 13 ++++++++-----
 doc/lispintro/emacs-lisp-intro.texi |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index 4e71793b66..e71d653210 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 47a5a870fd..e00edeb392 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