(save-some-buffers): At each map-y-or-n-p iteration,

check whether the buffer is still alive.

1 files changed, 4 insertions, 1 deletions

diff --git a/lisp/files.el b/lisp/files.el
index ba281a908a1..0e303805d0c 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4351,7 +4351,10 @@ change the additional actions you can take on files."
       (setq files-done
             (map-y-or-n-p
              (lambda (buffer)
-               (and (buffer-modified-p buffer)
+               ;; Note that killing some buffers may kill others via
+               ;; hooks (e.g. Rmail and its viewing buffer).
+               (and (buffer-live-p buffer)
+                    (buffer-modified-p buffer)
                     (not (buffer-base-buffer buffer))
                     (or
                      (buffer-file-name buffer)