[Emacs-diffs] trunk r113172: lisp/window.el (window--state-get-1): Workaround for bug#14527.

[Juanma Barranquero]

------------------------------------------------------------
revno: 113172
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14527
author: Martin Rudalics <address@hidden>
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2013-06-25 17:44:42 +0200
message:
  lisp/window.el (window--state-get-1): Workaround for bug#14527.
  http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00941.html
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/window.el                 window.el-20091113204419-o5vbwnq5f7feedwu-94

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-25 15:39:13 +0000
+++ b/lisp/ChangeLog    2013-06-25 15:44:42 +0000
@@ -1,3 +1,8 @@
+2013-06-25  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/eww.el (eww-back-url): Implement the history by stashing all

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2013-04-13 14:37:20 +0000
+++ b/lisp/window.el    2013-06-25 15:44:42 +0000
@@ -4258,7 +4258,8 @@
             (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