* lisp/desktop.el (desktop-create-buffer): Check that buffers are still live

before burying them.

Fixes: debbugs:18373

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7018d3c8abb9bb355286eac5ffa5884f0cc9eef8..46cb4ba0d6891704a95fd2eba702199a9a41ce80 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-10  Ivan Shmakov  <ivan@siamics.net>  (tiny change)
+
+       * desktop.el (desktop-create-buffer): Check that buffers are still live
+       before burying them (bug#18373).
+
 2014-09-09  Glenn Morris  <rgm@gnu.org>
 
        * calendar/diary-lib.el (diary-list-entries):

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 40e6b364e45c42efc1fc32e6a6e9bc171be84e50..360ff48339bb62b402b4ff14cd994a70c850b6cc 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1375,7 +1375,9 @@ after that many seconds of idle time."
        ;; Restore buffer list order with new buffer at end. Don't change
        ;; the order for old desktop files (old desktop module behavior).
        (unless (< desktop-file-version 206)
-         (mapc 'bury-buffer buffer-list)
+         (dolist (buf buffer-list)
+            (and (buffer-live-p buf)
+                 (bury-buffer buf)))
          (when result (bury-buffer result)))
        (when result
          (unless (or desktop-first-buffer (< desktop-file-version 206))