From: ueno <ueno>
Date: Fri, 4 Feb 2005 02:47:39 +0000 (+0000)
Subject: Undo the last change.
X-Git-Tag: riece-1_0_7~50
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=b69a2c0c0ca2c47521c9f690427ce5b56bd0f22e;p=elisp%2Friece.git

Undo the last change.
---

diff --git a/lisp/riece-400.el b/lisp/riece-400.el
index add65b0..e469edf 100644
--- a/lisp/riece-400.el
+++ b/lisp/riece-400.el
@@ -71,9 +71,15 @@
 	 key)
     (message "%s: %s" (car parameters) (nth 1 parameters))
     (setq key
-	  (riece-read-passwd
-	   (format "Key for %s: "
-		   (riece-format-identity channel-identity t))))
+	  (condition-case nil
+	      (let (inhibit-quit)
+		(riece-read-passwd
+		 (format "Key for %s: "
+			 (riece-format-identity channel-identity t))))
+	    (quit
+	     (message "Key for %s: Quit"
+		      (riece-format-identity channel-identity t))
+	     'quit)))
     (unless (eq key 'quit)
       (riece-command-join-channel channel-identity key))))
 
diff --git a/lisp/riece-compat.el b/lisp/riece-compat.el
index 43f7797..5e4c2a0 100644
--- a/lisp/riece-compat.el
+++ b/lisp/riece-compat.el
@@ -51,12 +51,7 @@
 (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)
diff --git a/lisp/riece-irc.el b/lisp/riece-irc.el
index a84a607..caecdc7 100644
--- a/lisp/riece-irc.el
+++ b/lisp/riece-irc.el
@@ -60,10 +60,17 @@
       (if riece-reconnect-with-password	;password incorrect or not set.
 	  (unwind-protect
 	      (setq password
-		    (if (equal server-name "")
-			(riece-read-passwd "Password: ")
-		      (riece-read-passwd (format "Password for %s: "
-						 server-name))))
+		    (condition-case nil
+			(let (inhibit-quit)
+			  (if (equal server-name "")
+			      (riece-read-passwd "Password: ")
+			    (riece-read-passwd (format "Password for %s: "
+						       server-name))))
+		      (quit
+		       (if (equal server-name "")
+			   (message "Password: Quit")
+			 (message "Password for %s: " server-name))
+		       'quit)))
 	    (setq riece-reconnect-with-password nil)))
       (if (eq password 'quit)
 	  (delete-process process)