Don't require riece-inlines.el any more

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index 064fa8e..e0746b1 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (if (featurep 'xemacs)
     (require 'riece-xemacs)
   (require 'riece-emacs))
@@ -295,14 +293,13 @@ For a list of the generic commands type \\[riece-command-generic] ? RET.
        mode-line-buffer-identification
        (riece-mode-line-buffer-identification
         '("Riece: "
-          "{"
           riece-away-indicator
           riece-operator-indicator
           riece-freeze-indicator
-          "} "
+          " "
           riece-user-indicator
           " "
-          riece-channel-indicator)))
+          riece-current-channel)))
   (riece-simplify-mode-line-format)
   (use-local-map riece-command-mode-map)
 
@@ -334,11 +331,10 @@ Instead, these commands are available:
        mode-line-buffer-identification
        (riece-mode-line-buffer-identification
         '("Riece: "
-          "{"
           riece-away-indicator
           riece-operator-indicator
           riece-freeze-indicator
-          "} "
+          " "
           riece-channel-list-indicator " "))
        buffer-read-only t
        tab-stop-list riece-tab-stop-list)
@@ -364,12 +360,9 @@ Instead, these commands are available:
   (setq mode-line-buffer-identification
        (riece-mode-line-buffer-identification
         '("Riece: "
-          "{"
           riece-away-indicator
           riece-operator-indicator
           riece-freeze-indicator
-          "} "
-          riece-user-indicator
           " "
           riece-channel-indicator))))