X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-compat.el;h=3e54caf5508e00a772823df3aeebf3e3bd853275;hb=6d7051cd0e0b2c4cbd38ba31f0fa293ac1f9382d;hp=2bc6469bd3425dc5c82e1f2cd678eceef6cd73aa;hpb=ac4357b486b2f72e161dd2b4f050c6f4f9354709;p=elisp%2Friece.git

diff --git a/lisp/riece-compat.el b/lisp/riece-compat.el
index 2bc6469..3e54caf 100644
--- a/lisp/riece-compat.el
+++ b/lisp/riece-compat.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -48,15 +48,9 @@
     (end-of-line)
     (point)))
 
-(defvar riece-read-passwd nil)
+(autoload 'read-passwd "passwd")
+(defvar riece-read-passwd #'read-passwd)
 (defun riece-read-passwd (prompt)
-  (if (not riece-read-passwd)
-      (if (functionp 'read-passwd)
-	  (setq riece-read-passwd 'read-passwd)
-	(if (load "passwd" t)
-	    (setq riece-read-passwd 'read-passwd)
-	  (autoload 'ange-ftp-read-passwd "ange-ftp")
-	  (setq riece-read-passwd 'ange-ftp-read-passwd))))
   (funcall riece-read-passwd prompt))
 
 (if (string-match "0\\{0\\}" "")