* riece-compat.el (riece-read-passwd): Changed default value.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa80893..1ef82a7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2005-02-04  Daiki Ueno  <ueno@unixuser.org>
 
+       * riece-compat.el (riece-read-passwd): Changed default value.
+
        * riece-400.el (riece-handle-475-message): Don't bind inhibit-quit
        when reading channel key.
 

diff --git a/lisp/riece-compat.el b/lisp/riece-compat.el
index 3148260..d3b9155 100644 (file)
--- a/lisp/riece-compat.el
+++ b/lisp/riece-compat.el
@@ -48,20 +48,20 @@
     (end-of-line)
     (point)))
 
-(defvar riece-read-passwd nil)
+(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)))
+
 (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))))
   (condition-case nil
       (let (inhibit-quit)
        (funcall riece-read-passwd prompt))
     (quit
-     (message "%s: Quit" prompt)
+     (message "%sQuit" prompt)
      'quit)))
 
 (if (string-match "0\\{0\\}" "")