[Emacs-diffs] emacs-24 r117492: * lisp/desktop.el (desktop-create-buffer): Check that buffers are still live

[Stefan Monnier]

------------------------------------------------------------
revno: 117492
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18373
author: Ivan Shmakov <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-09-09 20:47:20 -0400
message:
  * lisp/desktop.el (desktop-create-buffer): Check that buffers are still live
  before burying them.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/desktop.el                desktop.el-20091113204419-o5vbwnq5f7feedwu-591

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-09 18:09:54 +0000
+++ b/lisp/ChangeLog    2014-09-10 00:47:20 +0000
@@ -1,3 +1,8 @@
+2014-09-10  Ivan Shmakov  <address@hidden>  (tiny change)
+
+       * desktop.el (desktop-create-buffer): Check that buffers are still live
+       before burying them (bug#18373).
+
 2014-09-09  Glenn Morris  <address@hidden>
 
        * calendar/diary-lib.el (diary-list-entries):

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2014-07-16 04:28:42 +0000
+++ b/lisp/desktop.el   2014-09-10 00:47:20 +0000
@@ -1375,7 +1375,9 @@
        ;; 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))