2 files changed, 21 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1210b331ff..207c6c89ce8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,9 @@
-2006-02-23  Ken Manheimer  <ken.manheimer@gmail.com>
+2006-03-03  Martin Rudalics  <rudalics@gmx.at>
+
+        * midnight.el (clean-buffer-list): Handle case where base-buffer of
+        indirect buffer gets killed before indirect buffer.  Use dolist.
+
+2006-03-03  Ken Manheimer  <ken.manheimer@gmail.com>
 
         * emacs-lisp/edebug.el (edebug-display): Use `edebug-sit-for-seconds'
         value instead of a literal constant (1) on more pauses.
diff --git a/lisp/midnight.el b/lisp/midnight.el
index 1d5974f686f..1d9e1efbf2c 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -179,20 +179,21 @@ displayed (can be nil if the buffer was never displayed) and its
 lifetime, i.e., its \"age\" when it will be purged."
   (interactive)
   (let ((tm (float-time)) bts (ts (format-time-string "%Y-%m-%d %T"))
-        (bufs (buffer-list)) buf delay cbld bn)
-    (while (setq buf (pop bufs))
-      (setq bts (midnight-buffer-display-time buf) bn (buffer-name buf)
-            delay (if bts (- tm bts) 0) cbld (clean-buffer-list-delay bn))
-      (message "[%s] `%s' [%s %d]" ts bn (if bts (round delay)) cbld)
-      (unless (or (midnight-find bn clean-buffer-list-kill-never-regexps
-                                 'string-match)
-                  (midnight-find bn clean-buffer-list-kill-never-buffer-names
-                                 'string-equal)
-                  (get-buffer-process buf)
-                  (and (buffer-file-name buf) (buffer-modified-p buf))
-                  (get-buffer-window buf 'visible) (< delay cbld))
-        (message "[%s] killing `%s'" ts bn)
-        (kill-buffer buf)))))
+        delay cbld bn)
+    (dolist (buf (buffer-list))
+      (when (buffer-live-p buf)
+        (setq bts (midnight-buffer-display-time buf) bn (buffer-name buf)
+              delay (if bts (- tm bts) 0) cbld (clean-buffer-list-delay bn))
+        (message "[%s] `%s' [%s %d]" ts bn (if bts (round delay)) cbld)
+        (unless (or (midnight-find bn clean-buffer-list-kill-never-regexps
+                                   'string-match)
+                    (midnight-find bn clean-buffer-list-kill-never-buffer-names
+                                   'string-equal)
+                    (get-buffer-process buf)
+                    (and (buffer-file-name buf) (buffer-modified-p buf))
+                    (get-buffer-window buf 'visible) (< delay cbld))
+          (message "[%s] killing `%s'" ts bn)
+          (kill-buffer buf))))))
 
 ;;; midnight hook