2007-06-21 Nikita Danilov <nikita@clusterfs.com>

[elisp/riece.git] / lisp / riece-000.el

diff --git a/lisp/riece-000.el b/lisp/riece-000.el
index 4651d59..bd26fb6 100644 (file)
--- a/lisp/riece-000.el
+++ b/lisp/riece-000.el
@@ -38,7 +38,7 @@
 (defun riece-handle-001-message (prefix number name string)
   "RPL_WELCOME \"Welcome to the Internet Relay Network <nick>!<user>@<host>\""
   (if riece-real-server-name
-      (error "Already registered"))
+      (error (riece-mcat "Already registered")))
   (setq riece-real-server-name prefix
        riece-real-nickname name
        riece-real-userhost nil)
@@ -50,8 +50,9 @@
    (list riece-dialogue-buffer riece-others-buffer)
    (concat (substring string 1) "\n"))
   (if (equal riece-server-name "")
-      (message "Logging in to IRC server...done")
-    (message "Logging in to %s...done" riece-server-name))
+      (message (riece-mcat "Logging in to IRC server...done"))
+    (message (riece-mcat "Logging in to %s...done") riece-server-name))
+  (run-hooks 'riece-after-login-hook)
   (let ((channel-list riece-startup-channel-list)
        entry identity)
     (while channel-list
@@ -61,8 +62,7 @@
                  (setq identity (riece-parse-identity (car entry))))
                 riece-server-name)
          (riece-command-join-channel identity (nth 1 entry)))
-      (setq channel-list (cdr channel-list))))
-  (run-hooks 'riece-after-login-hook))
+      (setq channel-list (cdr channel-list)))))
 
 (defun riece-handle-004-message (prefix number name string)
   "RPL_MYINFO \"<umodes> <chnlmodes>\""