X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece.el;h=70f069bb1495b7deae4bdf566515bc3f6039bf3e;hb=5d549325c340600f76a2450177094a3353de432a;hp=6af3b3349434a4962734e7aa1deab0ccd3c9dfd4;hpb=e97555fd5e2b50919980ce005610f842d7825caa;p=riece

diff --git a/lisp/riece.el b/lisp/riece.el
index 6af3b33..70f069b 100644
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -258,7 +258,7 @@ If already connected, just pop up the windows."
 	(setq riece-server (completing-read "Server: " riece-server-alist)))
     (if (stringp riece-server)
 	(setq riece-server (riece-server-name-to-server riece-server)))
-    (setq riece-server-process (riece-start-server riece-server))
+    (riece-open-server riece-server)
     (riece-create-buffers)
     (riece-configure-windows)
     (let ((channel-list riece-startup-channel-list))
@@ -288,17 +288,22 @@ For a list of the generic commands type \\[riece-command-generic] ? RET.
   (interactive)
   (kill-all-local-variables)
 
-  (setq major-mode 'riece-command-mode
+  (setq riece-away-indicator "-"
+	riece-operator-indicator "-"
+	major-mode 'riece-command-mode
 	mode-name "Commands"
-	riece-away-indicator "-"
-	riece-freeze-indicator "-"
-	riece-own-freeze-indicator "-"
 	mode-line-buffer-identification
 	(riece-mode-line-buffer-identification
 	 '("Riece: "
 	   mode-line-modified
+	   "{"
 	   riece-away-indicator
-	   "-- " riece-current-channel " " riece-real-nickname)))
+	   riece-operator-indicator
+	   riece-freeze-indicator
+	   "} "
+	   riece-user-indicator
+	   " "
+	   riece-channel-indicator)))
   (riece-simplify-mode-line-format)
   (use-local-map riece-command-mode-map)
 
@@ -320,28 +325,26 @@ Instead, these commands are available:
   (kill-all-local-variables)
 
   (make-local-variable 'riece-freeze)
-  (make-local-variable 'riece-freeze-indicator)
-  (make-local-variable 'riece-own-freeze)
-  (make-local-variable 'riece-own-freeze-indicator)
   (make-local-variable 'tab-stop-list)
 
   (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-operator-indicator "-"
 	major-mode 'riece-dialogue-mode
 	mode-name "Dialogue"
 	mode-line-buffer-identification
 	(riece-mode-line-buffer-identification
 	 '("Riece: "
 	   mode-line-modified
+	   "{"
 	   riece-away-indicator
+	   riece-operator-indicator
 	   riece-freeze-indicator
-	   riece-own-freeze-indicator
-	   " " riece-channel-list-indicator " "))
+	   "} "
+	   riece-channel-list-indicator " "))
 	buffer-read-only t
 	tab-stop-list riece-tab-stop-list)
+  (riece-update-status-indicators)
   (riece-simplify-mode-line-format)
   (use-local-map riece-dialogue-mode-map)
   (buffer-disable-undo)
@@ -364,9 +367,12 @@ Instead, these commands are available:
 	(riece-mode-line-buffer-identification
 	 '("Riece: "
 	   mode-line-modified
+	   "{"
 	   riece-away-indicator
+	   riece-operator-indicator
 	   riece-freeze-indicator
-	   riece-own-freeze-indicator
+	   "} "
+	   riece-user-indicator
 	   " "
 	   riece-channel-indicator))))
 
@@ -391,7 +397,7 @@ Instead, these commands are available:
   (kill-all-local-variables)
   (setq mode-line-modified "--- "
         major-mode 'riece-user-list-mode
-        mode-name "Riece Channel member"
+        mode-name "User list"
 	mode-line-buffer-identification
 	(riece-mode-line-buffer-identification
 	 '("Riece: " riece-channel-indicator " "))
@@ -415,8 +421,7 @@ Instead, these commands are available:
 
 (defun riece-load-and-build-addon-dependencies (addons)
   (let ((load-path (cons riece-addon-directory load-path))
-	dependencies
-	pointer)
+	dependencies)
     (while addons
       (require (car addons))		;error will be reported here
       (let* ((requires