[Erc-commit] [commit][emacs22] Make sure all buffers returned from `erc-buffer-filter' are live.

[mwolson]

commit e788189303c0336e79d82025b3c945ba59b4a413
Author: Michael Olson <address@hidden>
Date:   Thu Jun 1 21:49:50 2006 +0000

    Make sure all buffers returned from `erc-buffer-filter' are live.
    
    * erc.el (erc-buffer-filter): Make sure all buffers returned from this
      are live.
    git-archimport-id: address@hidden/erc--main--0--patch-1

diff --git a/ChangeLog b/ChangeLog
index d7ea2d5..2d6c995 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-01  Michael Olson  <address@hidden>
+
+       * erc.el (erc-buffer-filter): Make sure all buffers returned from
+       this are live.
+
 2006-05-15  Michael Olson  <address@hidden>
 
        * README: Add License information.  Permit images to be used,
diff --git a/erc.el b/erc.el
index 8240f10..c3c2a54 100644
--- a/erc.el
+++ b/erc.el
@@ -1595,12 +1595,13 @@ server connection, or nil which means all open 
connections."
     (delq
      nil
      (mapcar (lambda (buf)
-              (with-current-buffer buf
-                (and (eq major-mode 'erc-mode)
-                     (or (not proc)
-                         (eq proc erc-server-process))
-                     (funcall predicate)
-                     buf)))
+              (when (buffer-live-p buf)
+                (with-current-buffer buf
+                  (and (eq major-mode 'erc-mode)
+                       (or (not proc)
+                           (eq proc erc-server-process))
+                       (funcall predicate)
+                       buf))))
             (buffer-list)))))
 
 (defun erc-buffer-list (&optional predicate proc)