Simplify command buffer's mode-line-format.

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index ac3c37d..b8fe057 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -295,10 +295,13 @@ For a list of the generic commands type \\[riece-command-generic] ? RET.
        mode-line-buffer-identification
        (riece-mode-line-buffer-identification
         '("Riece: "
-          mode-line-modified
           riece-away-indicator
           riece-operator-indicator
-          "-- " riece-current-channel " " riece-real-nickname)))
+          riece-freeze-indicator
+          " "
+          riece-user-indicator
+          " "
+          riece-current-channel)))
   (riece-simplify-mode-line-format)
   (use-local-map riece-command-mode-map)
 
@@ -330,12 +333,11 @@ Instead, these commands are available:
        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)
@@ -360,11 +362,9 @@ Instead, these commands are available:
   (setq 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-indicator))))
 
@@ -387,9 +387,8 @@ All normal editing commands are turned off.
 Instead, these commands are available:
 \\{riece-user-list-mode-map}"
   (kill-all-local-variables)
-  (setq mode-line-modified "--- "
-        major-mode 'riece-user-list-mode
-        mode-name "Riece Channel member"
+  (setq major-mode 'riece-user-list-mode
+        mode-name "User list"
        mode-line-buffer-identification
        (riece-mode-line-buffer-identification
         '("Riece: " riece-channel-indicator " "))
@@ -413,8 +412,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