From e6044b29e65d3639c267bf4753391c7cc57106cf Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 8 Jun 2024 21:06:51 +0300
Subject: [PATCH 1/3] ; Minor fixes in ELisp manual

* doc/lispref/searching.texi (Regexp Search): Caveat about using
'search-spaces-regexp'.  (Bug#71429)
* doc/lispref/help.texi (Keys in Documentation): Fix markup.
---
 doc/lispref/help.texi      | 13 ++++++++-----
 doc/lispref/searching.texi |  6 +++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi
index f3c916a9ecc..dd51e32f8ad 100644
--- a/doc/lispref/help.texi
+++ b/doc/lispref/help.texi
@@ -334,6 +334,9 @@ stands for a key sequence that will invoke @var{command}, or @samp{M-x
 @item \@{@var{mapvar}@}
 stands for a summary of the keymap which is the value of the variable
 @var{mapvar}.  The summary is made using @code{describe-bindings}.
+The summary will normally exclude meny bindings, but if the
+@var{include-menus} argument to @code{substitute-command-keys} is
+non-@code{nil}, the menu bindings will be included.
 
 @item \<@var{mapvar}>
 stands for no text itself.  It is used only for a side effect: it
@@ -384,11 +387,6 @@ given a special face @code{help-key-binding}, but if the optional
 argument @var{no-face} is non-@code{nil}, the function doesn't add
 this face to the produced string.
 
-@defun substitute-quotes string
-This function works like @code{substitute-command-keys}, but only
-replaces quote characters.
-@end defun
-
 @cindex advertised binding
 If a command has multiple bindings, this function normally uses the
 first one it finds.  You can specify one particular key binding by
@@ -440,6 +438,11 @@ The keymap description will normally exclude menu items, but if
 @end group
 @end smallexample
 
+@defun substitute-quotes string
+This function works like @code{substitute-command-keys}, but only
+replaces quote characters.
+@end defun
+
   There are other special conventions for the text in documentation
 strings---for instance, you can refer to functions, variables, and
 sections of this manual.  @xref{Documentation Tips}, for details.
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index c697c929b6a..3022d127c13 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -2190,7 +2190,11 @@ this regular expression.  However, spaces inside of constructs such as
 
 Since this variable affects all regular expression search and match
 constructs, you should bind it temporarily for as small as possible
-a part of the code.
+a part of the code, and only where the Lisp code affected by the
+binding performs searches whose regexp was produced from interactive
+user input.  In other words, this variable should only be used to tell
+regexp search primitives how to interpret whitespace typed by the
+user.
 @end defvar
 
 @node POSIX Regexps

From 778f8c793d1c621fc8219644797ef44425bf0bb4 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 9 Jun 2024 20:56:39 +0300
Subject: [PATCH 2/3] ; * lisp/mail/rmail.el (rmail-get-new-mail-hook): Doc
 fix.

---
 lisp/mail/rmail.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 5747091c498..34724c5d204 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -462,7 +462,9 @@ as argument, to ask the user that question."
   "List of functions to call when Rmail is invoked.")
 
 (defvar rmail-get-new-mail-hook nil
-  "List of functions to call when Rmail has retrieved new mail.")
+  "List of functions to call when Rmail has retrieved new mail.
+The functions are called in `rmail-buffer' narrowed to include
+only the new email messages, with point at the first new mail.")
 
 ;;;###autoload
 (defcustom rmail-show-message-hook nil

From 59261e6f4fef0ec03c8127b29fe107ed19280a3b Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 12 Jun 2024 10:24:34 +0200
Subject: [PATCH 3/3] Fix auth-info-password

* lisp/auth-source.el (auth-info-password): :secret can be a
cascaded function.
---
 lisp/auth-source.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 5969cdbf9f8..4dcf7d73717 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -874,9 +874,9 @@ while \(:host t) would find all host entries."
 (defun auth-info-password (auth-info)
   "Return the :secret password from the AUTH-INFO."
   (let ((secret (plist-get auth-info :secret)))
-    (if (functionp secret)
-        (funcall secret)
-      secret)))
+    (while (functionp secret)
+      (setq secret (funcall secret)))
+    secret))
 
 (defun auth-source-pick-first-password (&rest spec)
   "Pick the first secret found by applying `auth-source-search' to SPEC."