2 files changed, 11 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 155063592b6..e797663b70a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-18  Juanma Barranquero  <lekktu@gmail.com>
+
+        * frameset.el (frameset--restore-frame): When a frame is being reused
+        and its root window is not alive, delete all the frame's windows before
+        restoring the window state.  This works around the issue in bug#16793.
+
 2014-02-18  Glenn Morris  <rgm@gnu.org>
 
         * textmodes/remember.el (remember-data-directory)
diff --git a/lisp/frameset.el b/lisp/frameset.el
index 977cc8433d4..f0b3c79f776 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -932,7 +932,11 @@ is the parameter alist of the frame being restored.  Internal use only."
            (setq frame (frameset--find-frame-if nil display))))
     ;; If found, remove from the list.
     (when frame
-      (setq frameset--reuse-list (delq frame frameset--reuse-list)))
+      (setq frameset--reuse-list (delq frame frameset--reuse-list))
+      ;; Workaround for feature/bug#16793
+      (let ((root (frame-root-window frame)))
+        (unless (window-live-p root)
+          (delete-other-windows-internal (frame-first-window root) root))))
     frame))
 
 (defun frameset--initial-params (parameters)