Fixed.

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index 6c07a16..1b66d48 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -53,7 +53,7 @@
 (put 'riece-channel-mode 'derived-mode-parent 'riece-dialogue-mode)
 
 (defvar riece-buffer-alist
-  '((riece-command-buffer "*Commands*" riece-command-mode)
+  '((riece-command-buffer "*Command*" riece-command-mode)
     (riece-dialogue-buffer "*Dialogue*" riece-dialogue-mode)
     (riece-others-buffer "*Others*" riece-others-mode)
     (riece-channel-list-buffer "*Channels*" riece-channel-list-mode)
@@ -180,7 +180,8 @@ If optional argument SAFE is nil, overwrite previous definitions."
 
   (riece-define-keys riece-command-mode-map
     "\r" riece-command-enter-message
-    [(control return)] riece-command-enter-message-as-notice)
+    [(control return)] riece-command-enter-message-as-notice
+    [tab] riece-command-complete-user)
 
   (riece-define-keys (riece-command-map riece-command-prefix
                                        riece-command-mode-map)
@@ -206,10 +207,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 +285,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 +324,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"
@@ -340,13 +347,12 @@ For a list of the generic commands type \\[riece-command-generic] ? RET.
   (setq riece-away-indicator "-"
        riece-operator-indicator "-"
        major-mode 'riece-command-mode
-       mode-name "Commands"
+       mode-name "Command"
        mode-line-buffer-identification
        (riece-mode-line-buffer-identification
         '("Riece: "
           riece-away-indicator
           riece-operator-indicator
-          riece-freeze-indicator
           " "
           riece-user-indicator
           " "
@@ -371,6 +377,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 "-"