X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-display.el;h=fbead8bdafe20288f3f9bc7cffb179acd1d22a01;hb=56142f660d66b693211be33f81e2b6908d142c66;hp=c9f5b3c0c18a22e7123a0b8c120bfe011efa66b8;hpb=5dfc7c4e4043c7ad3d05585e3dcb9e33744fdbbc;p=riece

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index c9f5b3c..fbead8b 100644
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -125,11 +125,13 @@ Local to the buffer in `riece-buffer-list'.")
 		 (riece-identity-server riece-current-channel))
 	  (riece-with-server-buffer (riece-identity-server
 				     riece-current-channel)
-	    (riece-identity-assoc
-	     (riece-identity-prefix (nth 1 (riece-signal-args signal)))
-	     (riece-channel-get-users (riece-identity-prefix
-				       riece-current-channel))
-	     t)))))
+	    (when (riece-channel-p (riece-identity-prefix
+				    riece-current-channel))
+	      (riece-identity-assoc
+	       (riece-identity-prefix (nth 1 (riece-signal-args signal)))
+	       (riece-channel-get-users (riece-identity-prefix
+					 riece-current-channel))
+	       t))))))
   (riece-connect-signal
    'user-renamed
    (lambda (signal handback)
@@ -325,7 +327,9 @@ Local to the buffer in `riece-buffer-list'.")
 	(while pointer
 	  (if (cdr pointer)
 	      (setcdr pointer (cons "," (cdr pointer))))
-	  (setq pointer (cdr (cdr pointer)))))
+	  (setq pointer (cdr (cdr pointer))))
+	(setq riece-channel-list-indicator
+	      (riece-normalize-modeline-string riece-channel-list-indicator)))
     (setq riece-channel-list-indicator "No channel")))
 
 (defun riece-update-status-indicators ()
@@ -343,7 +347,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,17 +382,18 @@ Local to the buffer in `riece-buffer-list'.")
 		      (if (memq ?o user)
 			  "@"
 			(if (memq ?v user)
-			    "+")
-			"-"))
+			    "+"
+			  "-")))
 		  "-"))))))
 
 (defun riece-update-buffers (&optional buffers)
   (unless buffers
     (setq buffers riece-buffer-list))
   (while buffers
-    (save-excursion
-      (set-buffer (car buffers))
-      (run-hooks 'riece-update-buffer-functions))
+    (if (buffer-live-p (car buffers))
+	(save-excursion
+	  (set-buffer (car buffers))
+	  (run-hooks 'riece-update-buffer-functions)))
     (setq buffers (cdr buffers)))
   (run-hooks 'riece-update-indicator-functions)
   (force-mode-line-update t)
@@ -396,7 +404,8 @@ Local to the buffer in `riece-buffer-list'.")
     (if channels
 	(setq identity (car channels))
       (if riece-debug
-	  (message "%S is not a member of riece-current-channels" identity)))
+	  (riece-debug (format "%S is not a member of riece-current-channels"
+			       identity))))
     (format riece-channel-buffer-format (riece-format-identity identity))))
 
 (eval-when-compile
@@ -420,7 +429,14 @@ Local to the buffer in `riece-buffer-list'.")
     (current-buffer)))
 
 (defun riece-channel-buffer (identity)
-  (cdr (riece-identity-assoc identity riece-channel-buffer-alist)))
+  (let ((entry (riece-identity-assoc identity riece-channel-buffer-alist)))
+    (if entry
+	(if (buffer-live-p (cdr entry))
+	    (cdr entry)
+	  (if riece-debug
+	      (riece-debug
+	       (format "riece-channel-buffer: nonexistent buffer: %s"
+		       (riece-format-identity identity))))))))
 
 (defun riece-switch-to-channel (identity)
   (let ((last riece-current-channel)
@@ -467,10 +483,13 @@ Local to the buffer in `riece-buffer-list'.")
 
 (defun riece-part-channel (identity)
   (let ((pointer (riece-identity-member identity riece-current-channels)))
-    (if pointer
-	(setcar pointer nil))
+    (unless pointer
+      (error "No such channel!"))
+    (setcar pointer nil)
     (if (riece-identity-equal identity riece-current-channel)
-	(riece-switch-to-nearest-channel pointer))))
+	(riece-switch-to-nearest-channel pointer)
+      (riece-emit-signal 'channel-list-changed))
+    (funcall riece-buffer-dispose-function (riece-channel-buffer identity))))
 
 (defun riece-redisplay-buffers (&optional force)
   (riece-update-buffers)