Mercurial > emacs

changeset 24600:5e026e6efc73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(nnmail-read-passwd): Use read-passwd if that is defined.
author Richard M. Stallman <rms@gnu.org>
date Thu, 08 Apr 1999 19:08:22 +0000
parents 04a29f9f6a22
children c22ae7f6afd9
files lisp/gnus/nnmail.el
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/nnmail.el	Thu Apr 08 19:08:11 1999 +0000
+++ b/lisp/gnus/nnmail.el	Thu Apr 08 19:08:22 1999 +0000
@@ -1689,11 +1689,13 @@
 	     (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 ()