[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108018: Ugly fix for bug#11556.

[martin rudalics]

------------------------------------------------------------
revno: 108018
committer: martin rudalics <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-05-28 11:48:29 +0200
message:
  Ugly fix for bug#11556.
  
  * desktop.el (desktop-read): Clear previous and next buffers for all
  windows and bury *Messages* buffer (bug#11556).
modified:
  lisp/ChangeLog
  lisp/desktop.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-18 09:41:42 +0000
+++ b/lisp/ChangeLog    2012-05-28 09:48:29 +0000
@@ -1,3 +1,8 @@
+2012-05-28  Martin Rudalics  <address@hidden>
+
+       * desktop.el (desktop-read): Clear previous and next buffers for
+       all windows and bury *Messages* buffer (bug#11556).
+
 2012-05-18  Eli Zaretskii  <address@hidden>
 
        * mail/sendmail.el (mail-yank-region): Recognize

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2012-02-10 15:59:29 +0000
+++ b/lisp/desktop.el   2012-05-28 09:48:29 +0000
@@ -1022,6 +1022,18 @@
                         (format ", %d to restore lazily"
                                 (length desktop-buffer-args-list))
                       ""))
+           ;; Bury the *Messages* buffer to not reshow it when burying
+           ;; the buffer we switched to above.
+           (when (buffer-live-p (get-buffer "*Messages*"))
+             (bury-buffer "*Messages*"))
+           ;; Clear all windows' previous and next buffers, these have
+           ;; been corrupted by the `switch-to-buffer' calls in
+           ;; `desktop-restore-file-buffer' (bug#11556).  This is a
+           ;; brute force fix and should be replaced by a more subtle
+           ;; strategy eventually.
+           (walk-window-tree (lambda (window)
+                               (set-window-prev-buffers window nil)
+                               (set-window-next-buffers window nil)))
            t))
       ;; No desktop file found.
       (desktop-clear)