From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 8 Apr 1999 19:08:22 +0000 (+0000)
Subject: (nnmail-read-passwd): Use read-passwd if that is defined.
X-Git-Tag: emacs-20.4~349
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=418cb80df259e83cd7b365eb71fbb9700c439a97;p=emacs.git

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

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 ()