Merge from trunk.

1 files changed, 0 insertions, 4 deletions

diff --git a/src/window.h b/src/window.h
index 6a9641e3e6d..c11235bd67b 100644
--- a/src/window.h
+++ b/src/window.h
@@ -258,10 +258,6 @@ struct window
        must run the redisplay-end-trigger-hook.  */
     Lisp_Object redisplay_end_trigger;
 
-    /* Non-nil means deleting or resizing this window distributes
-       space among all windows in the same combination.  */
-    Lisp_Object splits;
-
     /* Non-nil means this window's child windows are never
        (re-)combined.  */
     Lisp_Object nest;