* riece.el (riece-command-mode): Set default value of riece-freeze

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index 4885f9d..f4ef821 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -254,12 +254,11 @@ If already connected, just pop up the windows."
     (switch-to-buffer (riece-get-buffer-create riece-command-buffer))
     (unless (eq major-mode 'riece-command-mode)
       (riece-command-mode))
-    (let ((server-name
-          (if (or confirm (null riece-server))
-              (completing-read "Server: " riece-server-alist)
-            riece-server)))
-      (setq riece-server-process (riece-start-server
-                                 (riece-server-name-to-server server-name))))
+    (if (or confirm (null riece-server))
+       (setq riece-server (completing-read "Server: " riece-server-alist)))
+    (if (stringp riece-server)
+       (setq riece-server (riece-server-name-to-server riece-server)))
+    (riece-open-server riece-server)
     (riece-create-buffers)
     (riece-configure-windows)
     (let ((channel-list riece-startup-channel-list))
@@ -289,11 +288,13 @@ For a list of the generic commands type \\[riece-command-generic] ? RET.
   (interactive)
   (kill-all-local-variables)
 
-  (setq major-mode 'riece-command-mode
-       mode-name "Commands"
+  (setq riece-freeze riece-default-freeze
+       riece-freeze-indicator (if riece-freeze "F" "-")
+       riece-own-freeze riece-default-own-freeze
+       riece-own-freeze-indicator (if riece-own-freeze "M" "-")
        riece-away-indicator "-"
-       riece-freeze-indicator "-"
-       riece-own-freeze-indicator "-"
+       major-mode 'riece-command-mode
+       mode-name "Commands"
        mode-line-buffer-identification
        (riece-mode-line-buffer-identification
         '("Riece: "
@@ -330,7 +331,7 @@ Instead, these commands are available:
        riece-freeze-indicator (if riece-freeze "F" "-")
        riece-own-freeze riece-default-own-freeze
        riece-own-freeze-indicator (if riece-own-freeze "M" "-")
-
+       riece-away-indicator "-"
        major-mode 'riece-dialogue-mode
        mode-name "Dialogue"
        mode-line-buffer-identification