X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-display.el;h=2129482d8c909ae44dc7e6dc43ca4cad80547181;hp=f5f3f7682852013e3a7df2a5ae2b1232951e885b;hb=4cc66f8d5b60ad2f889baebc5edc2c5a65a00d3f;hpb=7f8ef19e817a830587c4790ee06991b1cc9912cd

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index f5f3f76..2129482 100644
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -343,7 +343,10 @@ Local to the buffer in `riece-buffer-list'.")
 			   (riece-user-get-operator riece-real-nickname))
 		      "O"
 		    "-")
-		  riece-user-indicator riece-real-nickname)))))
+		  riece-user-indicator
+		  (riece-format-identity
+		   (riece-make-identity riece-real-nickname riece-server-name)
+		   t))))))
   (walk-windows
    (lambda (window)
      (with-current-buffer (window-buffer window)
@@ -375,8 +378,8 @@ Local to the buffer in `riece-buffer-list'.")
 		      (if (memq ?o user)
 			  "@"
 			(if (memq ?v user)
-			    "+")
-			"-"))
+			    "+"
+			  "-")))
 		  "-"))))))
 
 (defun riece-update-buffers (&optional buffers)
@@ -471,7 +474,8 @@ Local to the buffer in `riece-buffer-list'.")
     (if pointer
 	(setcar pointer nil))
     (if (riece-identity-equal identity riece-current-channel)
-	(riece-switch-to-nearest-channel pointer))))
+	(riece-switch-to-nearest-channel pointer))
+    (funcall riece-buffer-dispose-function (riece-channel-buffer identity))))
 
 (defun riece-redisplay-buffers (&optional force)
   (riece-update-buffers)