[Emacs-diffs] trunk r116473: lisp/frameset.el: Workaround bug#16793.

[Juanma Barranquero]

------------------------------------------------------------
revno: 116473
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2014-02-18 18:33:37 +0100
message:
  lisp/frameset.el: Workaround bug#16793.
  
  lisp/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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/frameset.el               frameset.el-20130802043218-tfwraxv1c2zlibpw-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-18 08:09:51 +0000
+++ b/lisp/ChangeLog    2014-02-18 17:33:37 +0000
@@ -1,3 +1,9 @@
+2014-02-18  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * textmodes/remember.el (remember-data-directory)

=== modified file 'lisp/frameset.el'
--- a/lisp/frameset.el  2014-02-17 16:01:43 +0000
+++ b/lisp/frameset.el  2014-02-18 17:33:37 +0000
@@ -932,7 +932,11 @@
           (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)