aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/frameset.el
diff options
context:
space:
mode:
authorJuanma Barranquero2014-02-19 12:01:35 +0100
committerJuanma Barranquero2014-02-19 12:01:35 +0100
commitf097a3d25f77b08548c6d491ddf736ae3d6f58bf (patch)
treea70990d031dc22851fb910fc899a60b1bb679251 /lisp/frameset.el
parent8e009b788144d2a3a4a628e32d812718dee98109 (diff)
downloademacs-f097a3d25f77b08548c6d491ddf736ae3d6f58bf.tar.gz
emacs-f097a3d25f77b08548c6d491ddf736ae3d6f58bf.zip
lisp/frameset.el (frameset--reuse-frame): Remove workaround for bug#16793.
Diffstat (limited to 'lisp/frameset.el')
-rw-r--r--lisp/frameset.el6
1 files changed, 1 insertions, 5 deletions
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."
932 (setq frame (frameset--find-frame-if nil display)))) 932 (setq frame (frameset--find-frame-if nil display))))
933 ;; If found, remove from the list. 933 ;; If found, remove from the list.
934 (when frame 934 (when frame
935 (setq frameset--reuse-list (delq frame frameset--reuse-list)) 935 (setq frameset--reuse-list (delq frame frameset--reuse-list)))
936 ;; Workaround for feature/bug#16793
937 (let ((root (frame-root-window frame)))
938 (unless (window-live-p root)
939 (delete-other-windows-internal (frame-first-window root) root))))
940 frame)) 936 frame))
941 937
942(defun frameset--initial-params (parameters) 938(defun frameset--initial-params (parameters)