* riece-400.el (riece-handle-475-message): Don't bind inhibit-quit

when reading channel key.

* riece-irc.el (riece-irc-open-server): Don't bind inhibit-quit
when reading password.

* riece-compat.el (riece-read-passwd): Bind inhibit-quit.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d42b68c..aa80893 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2005-02-04  Daiki Ueno  <ueno@unixuser.org>
 
+       * riece-400.el (riece-handle-475-message): Don't bind inhibit-quit
+       when reading channel key.
+
+       * riece-irc.el (riece-irc-open-server): Don't bind inhibit-quit
+       when reading password.
+
+       * riece-compat.el (riece-read-passwd): Bind inhibit-quit.
+
        * riece-commands.el (riece-command-join): Abolished prefix-arg
        (channel key).
 

diff --git a/lisp/riece-400.el b/lisp/riece-400.el
index cb166c7..add65b0 100644 (file)
--- a/lisp/riece-400.el
+++ b/lisp/riece-400.el
@@ -71,15 +71,9 @@
         key)
     (message "%s: %s" (car parameters) (nth 1 parameters))
     (setq key
-         (condition-case nil
-             (let (inhibit-quit)
-               (riece-read-passwd
-                (format "Key for %s: "
-                        (riece-format-identity channel-identity t))))
-           (quit
-            (message (format "Key for %s: Quit"
-                             (riece-format-identity channel-identity t)))
-            'quit)))
+         (riece-read-passwd
+          (format "Key for %s: "
+                  (riece-format-identity channel-identity t))))
     (unless (eq key 'quit)
       (riece-command-join-channel channel-identity key))))
 

diff --git a/lisp/riece-compat.el b/lisp/riece-compat.el
index 2bc6469..3148260 100644 (file)
--- a/lisp/riece-compat.el
+++ b/lisp/riece-compat.el
@@ -57,7 +57,12 @@
            (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))
+  (condition-case nil
+      (let (inhibit-quit)
+       (funcall riece-read-passwd prompt))
+    (quit
+     (message "%s: Quit" prompt)
+     'quit)))
 
 (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 4126e7d..a84a607 100644 (file)
--- a/lisp/riece-irc.el
+++ b/lisp/riece-irc.el
@@ -60,18 +60,10 @@
       (if riece-reconnect-with-password        ;password incorrect or not set.
          (unwind-protect
              (setq password
-                   (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 (format "Password for %s: Quit"
-                                         server-name)))
-                      'quit)))
+                   (if (equal server-name "")
+                       (riece-read-passwd "Password: ")
+                     (riece-read-passwd (format "Password for %s: "
+                                                server-name))))
            (setq riece-reconnect-with-password nil)))
       (if (eq password 'quit)
          (delete-process process)