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

[riece] / lisp / riece-server.el

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index 3d6e366..ba66fce 100644 (file)
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -27,6 +27,8 @@
 (require 'riece-options)
 (require 'riece-globals)               ;for server local variables.
 (require 'riece-coding)                        ;riece-default-coding-system
+(require 'riece-identity)
+(require 'riece-compat)
 
 (eval-and-compile
   (defvar riece-server-keyword-map
@@ -60,22 +62,6 @@ the `riece-server-keyword-map' variable."
 (put 'riece-server-keyword-bind 'lisp-indent-function 1)
 (put 'riece-server-keyword-bind 'edebug-form-spec '(form body))
 
-(defun riece-clear-system ()
-  (while riece-buffer-list
-    (if (and (get-buffer (car riece-buffer-list))
-            (buffer-live-p (car riece-buffer-list)))
-       (funcall riece-buffer-dispose-function (car riece-buffer-list)))
-    (setq riece-buffer-list (cdr riece-buffer-list)))
-  (setq riece-current-channels nil
-       riece-current-channel nil
-       riece-user-indicator nil
-       riece-channel-indicator "None"
-       riece-channel-list-indicator "No channel"
-       riece-away-indicator "-"
-       riece-operator-indicator "-"
-       riece-freeze-indicator "-")
-  (delete-other-windows))
-
 (defun riece-server-parse-string (string)
   "Convert a STRING set as `riece-server' and return a property list."
   (when (or (string-match "^\\[\\([^]]+\\)\\]:?\\([0-9]*\\)" string)
@@ -139,22 +125,29 @@ the `riece-server-keyword-map' variable."
     (riece-process-send-string process string)))
 
 (defun riece-open-server (server server-name)
-  (if (equal server-name "")
-      (message "Connecting to IRC server...")
-    (message "Connecting to %s..." server-name))
   (riece-server-keyword-bind server
-    (let* (selective-display
-          (coding-system-for-read 'binary)
-          (coding-system-for-write 'binary)
-          (process
+    (let (selective-display
+         (coding-system-for-read 'binary)
+         (coding-system-for-write 'binary)
+         process)
+      (if (equal server-name "")
+         (message "Connecting to IRC server...")
+       (message "Connecting to %s..." server-name))
+      (setq process
            (funcall function (riece-server-process-name server-name)
                     (concat " *IRC*" server-name)
-                    host service)))
+                    host service))
+      (if (equal server-name "")
+         (message "Connecting to IRC server...done")
+       (message "Connecting to %s...done" server-name))
       (riece-reset-process-buffer process)
       (with-current-buffer (process-buffer process)
        (setq riece-server-name server-name))
       (set-process-sentinel process 'riece-sentinel)
       (set-process-filter process 'riece-filter)
+      (if (equal server-name "")
+         (message "Logging in to IRC server...")
+       (message "Logging in to %s..." server-name))
       (if (or password
              riece-reconnect-with-password)
          (riece-process-send-string process
@@ -173,10 +166,7 @@ the `riece-server-keyword-map' variable."
              riece-nick-accepted 'sent
              riece-coding-system coding))
       (setq riece-process-list
-           (cons process riece-process-list))))
-  (if (equal server-name "")
-      (message "Connecting to IRC server...done")
-    (message "Connecting to %s...done" server-name)))
+           (cons process riece-process-list)))))
 
 (defun riece-reset-process-buffer (process)
   (save-excursion