Undo the last change.

[riece] / lisp / riece-display.el

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index fd1e827..f675e99 100644 (file)
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -50,24 +50,24 @@ Local to the buffer in `riece-buffer-list'.")
     (set-buffer riece-user-list-buffer)
     (if (and riece-current-channel
             (riece-channel-p (riece-identity-prefix riece-current-channel)))
-       (let* ((channel
+       (let* ((users
                (with-current-buffer (process-buffer (riece-server-process
                                                      (riece-identity-server
                                                       riece-current-channel)))
-                 (riece-get-channel (riece-identity-prefix
-                                     riece-current-channel))))
-              (users (riece-channel-users channel))
+                 (riece-channel-get-users (riece-identity-prefix
+                                           riece-current-channel))))
               (inhibit-read-only t)
               buffer-read-only)
          (erase-buffer)
+         (riece-kill-all-overlays)
          (while users
-           (insert (if (riece-channel-operator-p channel (car users))
+           (insert (if (memq ?o (cdr (car users)))
                        "@"
-                     (if (riece-channel-speaker-p channel (car users))
+                     (if (memq ?v (cdr (car users)))
                          "+"
                        " "))
                    (riece-format-identity
-                    (riece-make-identity (car users)
+                    (riece-make-identity (car (car users))
                                          (riece-identity-server
                                           riece-current-channel))
                     t)
@@ -82,6 +82,7 @@ Local to the buffer in `riece-buffer-list'.")
          (index 1)
          (channels riece-current-channels))
       (erase-buffer)
+      (riece-kill-all-overlays)
       (while channels
        (if (car channels)
            (insert (riece-format-channel-list-line