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

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

diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 0b2243a1bf8..2e05e67f558 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -195,10 +195,12 @@ Return the response string if optional second argument is non-nil."
 (defvar pop3-read-passwd nil)
 (defun pop3-read-passwd (prompt)
   (if (not pop3-read-passwd)
-      (if (load "passwd" t)
+      (if (fboundp 'read-passwd)
 	  (setq pop3-read-passwd 'read-passwd)
-	(autoload 'ange-ftp-read-passwd "ange-ftp")
-	(setq pop3-read-passwd 'ange-ftp-read-passwd)))
+	(if (load "passwd" t)
+	    (setq pop3-read-passwd 'read-passwd)
+	  (autoload 'ange-ftp-read-passwd "ange-ftp")
+	  (setq pop3-read-passwd 'ange-ftp-read-passwd))))
   (funcall pop3-read-passwd prompt))
 
 (defun pop3-clean-region (start end)