summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2006-03-03 12:09:53 +0000
committerEli Zaretskii <eliz@gnu.org>2006-03-03 12:09:53 +0000
commitdeb42e05b1bc775971e4654ca5f6dd4a46ea864b (patch)
tree98e8c86c97020bbbc7f7cad86a174f7bad840840
parentf456dbd2154ec853b6cbea2f99974cd2c4ee38a0 (diff)
downloademacs-deb42e05b1bc775971e4654ca5f6dd4a46ea864b.tar.gz
(clean-buffer-list): Handle case where base-buffer of indirect buffer gets
killed before indirect buffer. Use dolist.
-rw-r--r--lisp/midnight.el29
1 files changed, 15 insertions, 14 deletions
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