* riece-identity.el (riece-format-identity): Return copied strings.

[riece] / lisp / riece-display.el

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index 3101aa3..b353474 100644 (file)
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -48,37 +48,37 @@ Local to the buffer in `riece-buffer-list'.")
 (defun riece-update-user-list-buffer ()
   (save-excursion
     (set-buffer riece-user-list-buffer)
-    (when (and riece-current-channel
-              (riece-channel-p (riece-identity-prefix riece-current-channel)))
-      (let (users operators speakers)
-       (with-current-buffer (process-buffer (riece-server-process
-                                             (riece-identity-server
-                                              riece-current-channel)))
-         (setq users
-               (riece-channel-get-users
-                (riece-identity-prefix riece-current-channel))
-               operators
-               (riece-channel-get-operators
-                (riece-identity-prefix riece-current-channel))
-               speakers
-               (riece-channel-get-speakers
-                (riece-identity-prefix riece-current-channel))))
-       (let ((inhibit-read-only t)
-             buffer-read-only)
-         (erase-buffer)
-         (while users
-           (insert (if (member (car users) operators)
-                       "@"
-                     (if (member (car users) speakers)
-                         "+"
-                       " "))
-                   (riece-format-identity
-                    (riece-make-identity (car users)
-                                         (riece-identity-server
-                                          riece-current-channel))
-                    t)
-                   "\n")
-           (setq users (cdr users))))))))
+    (if (and riece-current-channel
+            (riece-channel-p (riece-identity-prefix riece-current-channel)))
+       (let (users operators speakers)
+         (with-current-buffer (process-buffer (riece-server-process
+                                               (riece-identity-server
+                                                riece-current-channel)))
+           (setq users
+                 (riece-channel-get-users
+                  (riece-identity-prefix riece-current-channel))
+                 operators
+                 (riece-channel-get-operators
+                  (riece-identity-prefix riece-current-channel))
+                 speakers
+                 (riece-channel-get-speakers
+                  (riece-identity-prefix riece-current-channel))))
+         (let ((inhibit-read-only t)
+               buffer-read-only)
+           (erase-buffer)
+           (while users
+             (insert (if (member (car users) operators)
+                         "@"
+                       (if (member (car users) speakers)
+                           "+"
+                         " "))
+                     (riece-format-identity
+                      (riece-make-identity (car users)
+                                           (riece-identity-server
+                                            riece-current-channel))
+                      t)
+                     "\n")
+             (setq users (cdr users))))))))
 
 (defun riece-update-channel-list-buffer ()
   (save-excursion