* riece-server.el (riece-server-keyword-map): `:coding-system' ->

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index ac3c37d..70f069b 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -296,9 +296,14 @@ For a list of the generic commands type \\[riece-command-generic] ? RET.
        (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-channel-indicator)))
   (riece-simplify-mode-line-format)
   (use-local-map riece-command-mode-map)
 
@@ -331,11 +336,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-channel-list-indicator " "))
+          "} "
+          riece-channel-list-indicator " "))
        buffer-read-only t
        tab-stop-list riece-tab-stop-list)
   (riece-update-status-indicators)
@@ -361,10 +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))))
 
@@ -389,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 " "))
@@ -413,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