From 8bbdea0fb483997a4d40707dc14d77bc915d8c05 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Tue, 25 Jun 2013 17:44:42 +0200 Subject: [PATCH] lisp/window.el (window--state-get-1): Workaround for bug#14527. http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00941.html --- lisp/ChangeLog | 5 +++++ lisp/window.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c712e023c2a..d5417a8c2c5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-06-25 Martin Rudalics + + * window.el (window--state-get-1): Workaround for bug#14527. + http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00941.html + 2013-06-25 Lars Magne Ingebrigtsen * net/eww.el (eww-back-url): Implement the history by stashing all diff --git a/lisp/window.el b/lisp/window.el index 5b001988ddf..5ba32bac953 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -4258,7 +4258,8 @@ specific buffers." (total-width . ,(window-total-size window t)) (normal-height . ,(window-normal-size window)) (normal-width . ,(window-normal-size window t)) - (combination-limit . ,(window-combination-limit window)) + ,@(unless (window-live-p window) + `(combination-limit . ,(window-combination-limit window))) ,@(let ((parameters (window-parameters window)) list) ;; Make copies of those window parameters whose -- 2.39.2