* riece.el (riece): Remove nonexistent buffer from

riece-buffer-list when running riece-shrink-buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8fb4c3a..e34a940 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-21  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece.el (riece): Remove nonexistent buffer from
+       riece-buffer-list when running riece-shrink-buffer.
+
 2004-11-20  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-display.el (riece-update-buffers): Check existence of each

diff --git a/lisp/riece.el b/lisp/riece.el
index 1d49190..51e2d59 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -294,12 +294,13 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
               (lambda ()
                 (let ((buffers riece-buffer-list))
                   (while buffers
-                    (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)))
+                    (if (buffer-live-p (car buffers))
+                        (if (eq (derived-mode-class
+                                 (with-current-buffer (car buffers)
+                                   major-mode))
+                                'riece-dialogue-mode)
+                            (riece-shrink-buffer (car buffers)))
+                      (deql (car buffers) riece-buffer-list))
                     (setq buffers (cdr buffers))))))))
     (switch-to-buffer riece-command-buffer)
     (riece-display-connect-signals)