* riece-display.el (riece-update-buffers): Check existence each

buffer in riece-buffer-list.
* riece.el (riece): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 62cb1ee..107b5f4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2004-11-20  Daiki Ueno  <ueno@unixuser.org>
 
+       * riece-display.el (riece-update-buffers): Check existence each
+       buffer in riece-buffer-list.
+       * riece.el (riece): Ditto.
+
+2004-11-20  Daiki Ueno  <ueno@unixuser.org>
+
        * riece.el: Bind reporter-prompt-for-summary-p.
 
 2004-11-19  Daiki Ueno  <ueno@unixuser.org>

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index c9f5b3c..f5f3f76 100644 (file)
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -383,9 +383,10 @@ Local to the buffer in `riece-buffer-list'.")
   (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)

diff --git a/lisp/riece.el b/lisp/riece.el
index 59e84ba..863ea8a 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -294,10 +294,11 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
               (lambda ()
                 (let ((buffers riece-buffer-list))
                   (while buffers
-                    (if (eq (derived-mode-class
-                             (with-current-buffer (car buffers)
-                               major-mode))
-                            'riece-dialogue-mode)
+                    (if (and (buffer-live-p (car buffers))
+                             (eq (derived-mode-class
+                                  (with-current-buffer (car buffers)
+                                    major-mode))
+                                 'riece-dialogue-mode))
                         (riece-shrink-buffer (car buffers)))
                     (setq buffers (cdr buffers))))))))
     (switch-to-buffer riece-command-buffer)