* riece.el (riece-buffer-mode-alist): Add riece-user-list-buffer.

* riece-globals.el (riece-user-buffer-format): Abolish.
(riece-user-list-buffer): Default to " *Users*".
* riece-display.el (riece-user-list-buffer-name): Abolish.
(riece-user-list-buffer-create): Abolish.

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index a64db31..e234796 100644 (file)
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -239,35 +239,19 @@
                                   "\n"))))
     (current-buffer)))
 
-(defun riece-user-list-buffer-name (identity)
-  (format riece-user-list-buffer-format (riece-decode-identity identity)))
-
-(eval-when-compile
-  (autoload 'riece-user-list-mode "riece"))
-(defun riece-user-list-buffer-create (identity)
-  (with-current-buffer
-      (riece-get-buffer-create (riece-user-list-buffer-name identity))
-    (unless (eq major-mode 'riece-user-list-mode)
-      (riece-user-list-mode))
-    (current-buffer)))
-
 (defun riece-switch-to-channel (identity)
   (setq riece-last-channel riece-current-channel
        riece-current-channel identity
        riece-channel-buffer
-       (get-buffer (riece-channel-buffer-name identity))
-       riece-user-list-buffer
-       (get-buffer (riece-user-list-buffer-name identity)))
+       (get-buffer (riece-channel-buffer-name identity)))
   (run-hooks 'riece-channel-switch-hook))
 
 (defun riece-join-channel (identity)
   (unless (riece-identity-member identity riece-current-channels)
     (setq riece-current-channels
-         (riece-identity-assign-binding
-          identity riece-current-channels
-          riece-default-channel-binding)))
-  (riece-channel-buffer-create identity)
-  (riece-user-list-buffer-create identity))
+         (riece-identity-assign-binding identity riece-current-channels
+                                        riece-default-channel-binding))
+    (riece-channel-buffer-create identity)))
 
 (defun riece-switch-to-nearest-channel (pointer)
   (let ((start riece-current-channels)

diff --git a/lisp/riece-globals.el b/lisp/riece-globals.el
index 4f1305d..cb0c5eb 100644 (file)
--- a/lisp/riece-globals.el
+++ b/lisp/riece-globals.el
@@ -137,10 +137,8 @@ Local to the channel buffers.")
   "Format of channel message buffer.")
 (defvar riece-channel-list-buffer " *Channels*"
   "Name of channel list buffer.")
-(defvar riece-user-list-buffer nil
+(defvar riece-user-list-buffer " *Users*"
   "Name of user list buffer.")
-(defvar riece-user-list-buffer-format " *Users:%s*"
-  "Format of user list buffer.")
 (defvar riece-wallops-buffer " *WALLOPS*")
 
 (defvar riece-buffer-list nil)

diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el
index d30ca9d..5dbd1d7 100644 (file)
--- a/lisp/riece-handle.el
+++ b/lisp/riece-handle.el
@@ -46,11 +46,6 @@
                               old riece-server-name))
          (rename-buffer (riece-channel-buffer-name
                          (riece-make-identity new riece-server-name))))
-       (with-current-buffer (riece-user-list-buffer-name
-                             (riece-make-identity
-                              old riece-server-name))
-         (rename-buffer (riece-user-list-buffer-name
-                         (riece-make-identity new riece-server-name))))
        (if (riece-identity-equal (riece-make-identity
                                   old riece-server-name)
                                  riece-current-channel)

diff --git a/lisp/riece.el b/lisp/riece.el
index 4493f41..7357bdd 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -57,6 +57,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)))
@@ -361,6 +362,7 @@ 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)
   (setq major-mode 'riece-channel-list-mode
         mode-name "Channels"
        mode-line-buffer-identification
@@ -376,6 +378,7 @@ All normal editing commands are turned off.
 Instead, these commands are available:
 \\{riece-user-list-mode-map}"
   (kill-all-local-variables)
+  (buffer-disable-undo)
   (setq major-mode 'riece-user-list-mode
         mode-name "User list"
        mode-line-buffer-identification