X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-400.el;h=02ded58631fbbdcd035eb8b0b4785680619c0c6a;hb=bf2df5d4bf0f70c7f102eb924e352f83d46f3fa4;hp=6434ebca26c6a643fd0897dad67131290457aaab;hpb=9222fba22827675d278a7b3b91be4c1da371ef8f;p=elisp%2Friece.git

diff --git a/lisp/riece-400.el b/lisp/riece-400.el
index 6434ebc..02ded58 100644
--- a/lisp/riece-400.el
+++ b/lisp/riece-400.el
@@ -19,43 +19,71 @@
 
 ;; 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:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-globals)
 (require 'riece-misc)
+(require 'riece-mcat)
+(require 'riece-commands)
 
 (eval-when-compile
-  (autoload 'riece-default-handle-numeric-reply "riece-filter"))
+  (autoload 'riece-default-handle-numeric-reply "riece-handle"))
 (defun riece-handle-default-400-message (prefix number name string)
   (riece-default-handle-numeric-reply
    riece-error-prefix prefix number name string))
 
+(defun riece-handle-read-string (prompt)
+  (condition-case nil
+      (let (inhibit-quit)
+	(read-string prompt))
+    (quit
+     (ignore (message "%s" (concat prompt "Quit"))))))
+
 (defun riece-handle-432-message (prefix number name string)
   "ERR_ERRONEUSNICKNAME	\"<nick> :Erroneous nickname\"."
-  (riece-send-string
-   (format "NICK %s\r\n"
-	   (read-string
-	    (format "Erroneous nickname \"%s\".  Choose a new one: "
-		    (car (riece-split-parameters string)))))))
+  (let ((nickname
+	 (riece-handle-read-string
+	  (format (riece-mcat "Erroneous nickname \"%s\".  Choose a new one: ")
+		  (car (riece-split-parameters string))))))
+    (if nickname
+	(riece-send-string (format "NICK %s\r\n" nickname)))))
 
 (defun riece-handle-433-message (prefix number name string)
   "ERR_NICKNAMEINUSE \"<nick> :Nickname is already in use\"."
-  (riece-send-string
-   (format "NICK %s\r\n"
-	   (read-string
-	    (format "Nickname \"%s\" already in use.  Choose a new one: "
-		    (car (riece-split-parameters string)))))))
+  (let ((nickname
+	 (riece-handle-read-string
+	  (format (riece-mcat "Nickname \"%s\" already in use.  Choose a new one: ")
+		  (car (riece-split-parameters string))))))
+    (if nickname
+	(riece-send-string (format "NICK %s\r\n" nickname)))))
 
 (defun riece-handle-464-message (prefix number name string)
   "ERR_PASSWDMISMATCH \":Password incorrect\"."
-  (message "Password incorrect from %s." prefix)
+  (message (riece-mcat "Password incorrect from %s.") prefix)
   (setq riece-reconnect-with-password t))
 
+(defun riece-handle-475-message (prefix number name string)
+  "ERR_BADCHANNELKEY \"<channel> :Cannot join channel (+k)\"."
+  (let* ((parameters (riece-split-parameters string))
+	 (channel-identity (riece-make-identity (car parameters)
+						riece-server-name))
+	 key)
+    (setq key
+	  (condition-case nil
+	      (let (inhibit-quit)
+		(riece-read-passwd
+		 (format (riece-mcat "Key for %s: ")
+			 (riece-format-identity channel-identity t))))
+	    (quit
+	     (message (riece-mcat "Key for %s: Quit")
+		      (riece-format-identity channel-identity t))
+	     'quit)))
+    (unless (eq key 'quit)
+      (riece-command-join-channel channel-identity key))))
+
 (provide 'riece-400)
 
 ;;; riece-400.el ends here