diff options
| author | Eli Zaretskii | 2024-06-15 13:06:09 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2024-06-15 13:06:09 -0400 |
| commit | 1bc093e33cb60eb85efe6a61d42d7ea58b40fa57 (patch) | |
| tree | 93d855511be95dfc1099e94f9e1405630708a18f /lisp | |
| parent | 9b2e1b5e16c233cf5ea039e17175580793a4e5ef (diff) | |
| parent | 59261e6f4fef0ec03c8127b29fe107ed19280a3b (diff) | |
| download | emacs-1bc093e33cb60eb85efe6a61d42d7ea58b40fa57.tar.gz emacs-1bc093e33cb60eb85efe6a61d42d7ea58b40fa57.zip | |
Merge from origin/emacs-29
59261e6f4fe Fix auth-info-password
778f8c793d1 ; * lisp/mail/rmail.el (rmail-get-new-mail-hook): Doc fix.
e6044b29e65 ; Minor fixes in ELisp manual
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/auth-source.el | 6 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/auth-source.el b/lisp/auth-source.el index 2de78c5ae55..9ec9ede80e0 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el | |||
| @@ -869,9 +869,9 @@ while \(:host t) would find all host entries." | |||
| 869 | (defun auth-info-password (auth-info) | 869 | (defun auth-info-password (auth-info) |
| 870 | "Return the :secret password from the AUTH-INFO." | 870 | "Return the :secret password from the AUTH-INFO." |
| 871 | (let ((secret (plist-get auth-info :secret))) | 871 | (let ((secret (plist-get auth-info :secret))) |
| 872 | (if (functionp secret) | 872 | (while (functionp secret) |
| 873 | (funcall secret) | 873 | (setq secret (funcall secret))) |
| 874 | secret))) | 874 | secret)) |
| 875 | 875 | ||
| 876 | (defun auth-source-pick-first-password (&rest spec) | 876 | (defun auth-source-pick-first-password (&rest spec) |
| 877 | "Pick the first secret found by applying `auth-source-search' to SPEC." | 877 | "Pick the first secret found by applying `auth-source-search' to SPEC." |
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index d422383acdf..2b119c7a5c7 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el | |||
| @@ -462,7 +462,9 @@ as argument, to ask the user that question." | |||
| 462 | "List of functions to call when Rmail is invoked.") | 462 | "List of functions to call when Rmail is invoked.") |
| 463 | 463 | ||
| 464 | (defvar rmail-get-new-mail-hook nil | 464 | (defvar rmail-get-new-mail-hook nil |
| 465 | "List of functions to call when Rmail has retrieved new mail.") | 465 | "List of functions to call when Rmail has retrieved new mail. |
| 466 | The functions are called in `rmail-buffer' narrowed to include | ||
| 467 | only the new email messages, with point at the first new mail.") | ||
| 466 | 468 | ||
| 467 | ;;;###autoload | 469 | ;;;###autoload |
| 468 | (defcustom rmail-show-message-hook nil | 470 | (defcustom rmail-show-message-hook nil |