* riece.el (riece-command-mode): Don't display

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index 6c07a16..5ffc199 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -206,10 +206,10 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "o" riece-command-set-operators
     "v" riece-command-set-voices
     "f" riece-command-finger
-    " " riece-command-nick-scroll-up
-    "\177" riece-command-nick-scroll-down
-    [delete] riece-command-nick-scroll-down
-    [backspace] riece-command-nick-scroll-down
+    " " riece-command-user-list-scroll-up
+    "\177" riece-command-user-list-scroll-down
+    [delete] riece-command-user-list-scroll-down
+    [backspace] riece-command-user-list-scroll-down
     "c" riece-command-select-command-buffer)
 
   (riece-define-keys riece-channel-list-mode-map
@@ -284,8 +284,13 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
                         (riece-shrink-buffer (car buffers)))
                     (setq buffers (cdr buffers))))))))
     (switch-to-buffer riece-command-buffer)
+    (riece-display-connect-signals)
     (riece-redisplay-buffers)
     (riece-open-server riece-server "")
+    (let ((server-list riece-startup-server-list))
+      (while server-list
+       (riece-command-open-server (car server-list))
+       (setq server-list (cdr server-list))))
     (run-hooks 'riece-startup-hook)
     (message "%s" (substitute-command-keys
                   "Type \\[describe-mode] for help"))))
@@ -318,6 +323,7 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
   (setq riece-server nil
        riece-current-channels nil
        riece-current-channel nil
+       riece-channel-buffer nil
        riece-channel-buffer-alist nil
        riece-user-indicator nil
        riece-long-channel-indicator "None"
@@ -346,7 +352,6 @@ For a list of the generic commands type \\[riece-command-generic] ? RET.
         '("Riece: "
           riece-away-indicator
           riece-operator-indicator
-          riece-freeze-indicator
           " "
           riece-user-indicator
           " "
@@ -371,6 +376,7 @@ Instead, these commands are available:
 \\{riece-dialogue-mode-map}"
   (kill-all-local-variables)
   (make-local-variable 'riece-freeze)
+  (make-local-variable 'riece-freeze-indicator)
   (setq riece-freeze riece-default-freeze
        riece-away-indicator "-"
        riece-operator-indicator "-"