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."
 (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."
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."
   "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