Merge strict-naming branch.

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index a2d745b..f2a743b 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -24,12 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
-(if (featurep 'xemacs)
-    (require 'riece-xemacs)
-  (require 'riece-emacs))
-
 (require 'riece-filter)
 (require 'riece-display)
 (require 'riece-server)
@@ -59,6 +53,7 @@
 (defvar riece-buffer-mode-alist
   '((riece-dialogue-buffer . riece-dialogue-mode)
     (riece-others-buffer . riece-others-mode)
+    (riece-user-list-buffer . riece-user-list-mode)
     (riece-channel-list-buffer . riece-channel-list-mode)
     (riece-private-buffer . riece-dialogue-mode)
     (riece-wallops-buffer)))
@@ -199,7 +194,6 @@ If optional argument SAFE is nil, overwrite previous definitions."
   (riece-define-keys riece-channel-list-mode-map
     ">" riece-command-next-channel
     "<" riece-command-previous-channel
-    "u" riece-command-unread-channel
     "o" other-window
     "c" riece-command-select-command-buffer)
 
@@ -258,16 +252,9 @@ 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)))
-    (riece-open-server riece-server)
     (riece-create-buffers)
     (riece-configure-windows)
-    (let ((channel-list riece-startup-channel-list))
-      (while channel-list
-       (if (listp (car channel-list))
-           (riece-command-join (car (car channel-list))
-                               (cadr (car channel-list)))
-         (riece-command-join (car channel-list)))
-       (setq channel-list (cdr channel-list))))
+    (riece-open-server riece-server "")
     (run-hooks 'riece-startup-hook)
     (message "%s" (substitute-command-keys
                   "Type \\[describe-mode] for help"))))
@@ -288,17 +275,20 @@ 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-short-channel-indicator)))
   (riece-simplify-mode-line-format)
   (use-local-map riece-command-mode-map)
 
@@ -318,28 +308,21 @@ All normal editing commands are turned off.
 Instead, these commands are available:
 \\{riece-dialogue-mode-map}"
   (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-simplify-mode-line-format)
@@ -363,10 +346,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))))
 
@@ -374,6 +356,8 @@ Instead, these commands are available:
   "Major mode for displaying channel list.
 All normal editing commands are turned off."
   (kill-all-local-variables)
+  (buffer-disable-undo)
+  (make-local-variable 'riece-redisplay-buffer)
   (setq major-mode 'riece-channel-list-mode
         mode-name "Channels"
        mode-line-buffer-identification
@@ -389,9 +373,10 @@ 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"
+  (buffer-disable-undo)
+  (make-local-variable 'riece-redisplay-buffer)
+  (setq major-mode 'riece-user-list-mode
+        mode-name "User list"
        mode-line-buffer-identification
        (riece-mode-line-buffer-identification
         '("Riece: " riece-channel-indicator " "))
@@ -415,8 +400,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