From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 19 Feb 2014 11:01:35 +0000 (+0100)
Subject: lisp/frameset.el (frameset--reuse-frame): Remove workaround for bug#16793.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~17
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f097a3d25f77b08548c6d491ddf736ae3d6f58bf;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27c681bd945..f65b33e679f 100644
--- 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 f0b3c79f776..977cc8433d4 100644
--- 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)