Merge from origin/emacs-29

59261e6f4f Fix auth-info-password
778f8c793d ; * lisp/mail/rmail.el (rmail-get-new-mail-hook): Doc fix.
e6044b29e6 ; Minor fixes in ELisp manual
This commit is contained in:
Eli Zaretskii 2024-06-15 13:06:09 -04:00
commit 1bc093e33c
4 changed files with 19 additions and 10 deletions

View file

@ -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.

View file

@ -2216,7 +2216,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 Longest Match

View file

@ -869,9 +869,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."

View file

@ -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