(nnmail-read-passwd): Use read-passwd if that is defined.

1 files changed, 6 insertions, 4 deletions

diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 056600b8255..4774f2fc3a8 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1689,11 +1689,13 @@ If ARGS, PROMPT is used as an argument to `format'."
              (apply 'format prompt args)
            prompt)))
     (unless nnmail-read-passwd
-      (if (load "passwd" t)
+      (if (fboundp 'read-passwd)
           (setq nnmail-read-passwd 'read-passwd)
-        (unless (fboundp 'ange-ftp-read-passwd)
-          (autoload 'ange-ftp-read-passwd "ange-ftp"))
-        (setq nnmail-read-passwd 'ange-ftp-read-passwd)))
+        (if (load "passwd" t)
+            (setq nnmail-read-passwd 'read-passwd)
+          (unless (fboundp 'ange-ftp-read-passwd)
+            (autoload 'ange-ftp-read-passwd "ange-ftp"))
+          (setq nnmail-read-passwd 'ange-ftp-read-passwd))))
     (funcall nnmail-read-passwd prompt)))
 
 (defun nnmail-check-syntax ()