lisp/frameset.el (frameset--reuse-frame): Remove workaround for bug#16793.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27c681bd9459cc18a1378efdf0fd380e9aec390e..f65b33e679f972bf4c3039be310ddec4b896eb39 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-19  Juanma Barranquero  <lekktu@gmail.com>
+
+       * frameset.el (frameset--reuse-frame): Remove workaround for bug#16793.
+
 2014-02-19  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (window-state-put): Allow WINDOW to refer to an

diff --git a/lisp/frameset.el b/lisp/frameset.el
index f0b3c79f7768414fc002ee83f1a5c7429128e339..977cc8433d4acdbbbde8f03ee9a211b726972be8 100644 (file)
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -932,11 +932,7 @@ 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))
-      ;; 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))))
+      (setq frameset--reuse-list (delq frame frameset--reuse-list)))
     frame))
 
 (defun frameset--initial-params (parameters)