X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-compat.el;h=5e4c2a0acd1885ded4b2c8a72d0deb313fe7224e;hb=b575aa680213c7bf0f02b4bf886fcd519bc14afd;hp=d3b91555ee322be4e856b8b0ca529136451c6297;hpb=7f945fb94ab8971d149f3d310c3431427a207d9f;p=riece

diff --git a/lisp/riece-compat.el b/lisp/riece-compat.el
index d3b9155..5e4c2a0 100644
--- a/lisp/riece-compat.el
+++ b/lisp/riece-compat.el
@@ -48,21 +48,10 @@
     (end-of-line)
     (point)))
 
-(defvar riece-read-passwd
-  (if (functionp 'read-passwd)
-      #'read-passwd
-    (if (load "passwd" t)
-	#'read-passwd
-      (autoload 'ange-ftp-read-passwd "ange-ftp")
-      #'ange-ftp-read-passwd)))
-
+(autoload 'read-passwd "passwd")
+(defvar riece-read-passwd #'read-passwd)
 (defun riece-read-passwd (prompt)
-  (condition-case nil
-      (let (inhibit-quit)
-	(funcall riece-read-passwd prompt))
-    (quit
-     (message "%sQuit" prompt)
-     'quit)))
+  (funcall riece-read-passwd prompt))
 
 (if (string-match "0\\{0\\}" "")
     (defun riece-make-interval-regexp (regexp min &optional max)