changeset 69262:724b1ba5b55c

(clean-buffer-list): Handle case where base-buffer of indirect buffer gets killed before indirect buffer. Use dolist.
author Eli Zaretskii <eliz@gnu.org>
date Fri, 03 Mar 2006 12:09:53 +0000
parents 3ed9abaf1a1a
children f4eced40513b
files lisp/midnight.el
diffstat 1 files changed, 15 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/midnight.el	Fri Mar 03 12:07:45 2006 +0000
+++ b/lisp/midnight.el	Fri Mar 03 12:09:53 2006 +0000
@@ -179,20 +179,21 @@
 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