* riece-server.el (riece-open-server): Display "Logging in to

[riece] / lisp / riece-000.el

diff --git a/lisp/riece-000.el b/lisp/riece-000.el
index 2d6eab6..9a442f2 100644 (file)
--- a/lisp/riece-000.el
+++ b/lisp/riece-000.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-misc)
 (require 'riece-filter)                        ;riece-default-handle-message
 (require 'riece-version)
@@ -39,13 +37,19 @@
 
 (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"))
   (setq riece-real-server-name prefix
        riece-real-nickname name
        riece-real-userhost nil)
   (riece-send-string (format "USERHOST %s\r\n" riece-real-nickname))
   (riece-insert-info
    (list riece-dialogue-buffer riece-others-buffer)
-   (concat (substring string 1) "\n")))
+   (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))
+  (run-hooks 'riece-after-login-hook))
 
 (defun riece-handle-004-message (prefix number name string)
   "RPL_MYINFO \"<umodes> <chnlmodes>\""