lisp/desktop.el (desktop-restore-frames): Call `sit-for'.

We want to be sure that new frames are visible before deleting
any remaining ones.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7074c0b4ddce165a5b73be898af54d7ccebc686..59f2bed01aa8dac3a0f85b72c0370515377d117e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-26  Juanma Barranquero  <lekktu@gmail.com>
+
+       * desktop.el (desktop-restore-frames): Call `sit-for' once all frames
+       are restored to be sure that they are visible before deleting any
+       remaining ones.
+
 2013-07-26  Matthias Meulien  <orontee@gmail.com>
 
        * vc/vc-dir.el (vc-dir-mode-map): Add binding for vc-print-root-log.

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 28c781d95e2875c9d14107c03ac4dd426491e7c2..a29a30971aaab2633cb96e49a17c794a32949bb4 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1404,6 +1404,10 @@ being set (usually, by reading it from the desktop)."
          (error
           (delay-warning 'desktop (error-message-string err) :error))))
 
+      ;; In case we try to delete the initial frame, we want to make sure that
+      ;; other frames are already visible (discussed in thread for bug#14841).
+      (sit-for 0 t)
+
       ;; Delete remaining frames, but do not fail if some resist being deleted.
       (unless (eq desktop-restoring-reuses-frames 'keep)
        (dolist (frame desktop--reuse-list)