Ugly fix for bug#11556.

* desktop.el (desktop-read): Clear previous and next buffers for all
windows and bury *Messages* buffer (bug#11556).

lisp/ChangeLog

+2012-05-28  Martin Rudalics  <rudalics@gmx.at>
+
+	* desktop.el (desktop-read): Clear previous and next buffers for
+	all windows and bury *Messages* buffer (bug#11556).
+
 2012-05-18  Eli Zaretskii  <eliz@gnu.org>
 
 	* mail/sendmail.el (mail-yank-region): Recognize

lisp/desktop.el

@@ -1022,6 +1022,18 @@ Using it may cause conflicts.  Use it anyway? " owner)))))
 			 (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)