Rename window-nest to window-combination-limit.

* window.h (window): Rename slot "nest" to "combination_limit".
* window.c (Fwindow_nest): Rename to Fwindow_combination_limit.
(Fset_window_nest): Rename to Fset_window_combination_limit.
(Vwindow_nest): Rename to Vwindow_combination_limit.
(recombine_windows, make_parent_window, make_window)
(Fsplit_window_internal, saved_window)
(Fset_window_configuration, save_window_save): Rename all
occurrences of window_nest to window_combination_limit.
* window.el (split-window, window-state-get-1)
(window-state-put-1, window-state-put-2): Rename occurrences of
window-nest to window-combination-limit.
* cus-start.el (window-nest): Rename to
window-combination-limit.
* windows.texi (Resizing Windows, Splitting Windows): Rename
occurrences of window-nest to window-combination-limit.

3 files changed, 29 insertions, 17 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4a9be99d5c..df356fbbfc0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-16  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (split-window, window-state-get-1)
+        (window-state-put-1, window-state-put-2): Rename occurrences of
+        window-nest to window-combination-limit.
+        * cus-start.el (window-nest): Rename to
+        window-combination-limit.
+
 2011-11-16  Chong Yidong  <cyd@gnu.org>
 
         * progmodes/autoconf.el (autoconf-mode): Fix comment-start-skip
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 3760a7a9d74..c8df8985be9 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -401,7 +401,7 @@ since it could result in memory overflow and make Emacs crash."
                        (const :tag "Only on ttys" :value tty)
                        (other :tag "Always" t)) "23.1")
              (window-splits windows boolean "24.1")
-             (window-nest windows boolean "24.1")
+             (window-combination-limit windows boolean "24.1")
              ;; xdisp.c
              (show-trailing-whitespace whitespace-faces boolean nil
                                        :safe booleanp)
diff --git a/lisp/window.el b/lisp/window.el
index ddb29b95856..6de37c1d16e 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3083,9 +3083,9 @@ frame.  The selected window is not changed by this function."
          (parent (window-parent window))
          (function (window-parameter window 'split-window))
          (window-side (window-parameter window 'window-side))
-         ;; Rebind `window-nest' since in some cases we may have to
-         ;; override its value.
-         (window-nest window-nest)
+         ;; Rebind `window-combination-limit' since in some cases we may
+         ;; have to override its value.
+         (window-combination-limit window-combination-limit)
          atom-root)
 
     (window--check frame)
@@ -3109,15 +3109,15 @@ frame.  The selected window is not changed by this function."
                  (or (not parent)
                      (not (window-parameter parent 'window-side))))
         ;; WINDOW is a side root window.  To make sure that a new parent
-        ;; window gets created set `window-nest' to t.
-        (setq window-nest t))
+        ;; window gets created set `window-combination-limit' to t.
+        (setq window-combination-limit t))
 
       (when (and window-splits size (> size 0))
         ;; If `window-splits' is non-nil and SIZE is a non-negative
         ;; integer, we cannot reasonably resize other windows.  Rather
-        ;; bind `window-nest' to t to make sure that subsequent window
-        ;; deletions are handled correctly.
-        (setq window-nest t))
+        ;; bind `window-combination-limit' to t to make sure that
+        ;; subsequent window deletions are handled correctly.
+        (setq window-combination-limit t))
 
       (let* ((parent-size
               ;; `parent-size' is the size of WINDOW's parent, provided
@@ -3126,7 +3126,7 @@ frame.  The selected window is not changed by this function."
              ;; `resize' non-nil means we are supposed to resize other
              ;; windows in WINDOW's combination.
              (resize
-              (and window-splits (not window-nest)
+              (and window-splits (not window-combination-limit)
                    ;; Resize makes sense in iso-combinations only.
                    (window-combined-p window horizontal)))
              ;; `old-size' is the current size of WINDOW.
@@ -3206,7 +3206,8 @@ frame.  The selected window is not changed by this function."
               ;; Make new-parent non-nil if we need a new parent window;
               ;; either because we want to nest or because WINDOW is not
               ;; iso-combined.
-              (or window-nest (not (window-combined-p window horizontal))))
+              (or window-combination-limit
+                  (not (window-combined-p window horizontal))))
         (setq new-normal
               ;; Make new-normal the normal size of the new window.
               (cond
@@ -3584,7 +3585,7 @@ specific buffers."
             (total-width . ,(window-total-size window t))
             (normal-height . ,(window-normal-size window))
             (normal-width . ,(window-normal-size window t))
-            (nest . ,(window-nest window))
+            (combination-limit . ,(window-combination-limit window))
             ,@(let (list)
                 (dolist (parameter (window-parameters window))
                   (unless (memq (car parameter)
@@ -3709,9 +3710,11 @@ value can be also stored on disk and read back in a new session."
                                      window-safe-min-width)))
 
               (if (window-sizable-p window (- size) horizontal 'safe)
-                  (let* ((window-nest (assq 'nest item)))
-                    ;; We must inherit the nesting, otherwise we might mess
-                    ;; up handling of atomic and side window.
+                  (let* ((window-combination-limit
+                          (assq 'combination-limit item)))
+                    ;; We must inherit the combiantion limit, otherwise
+                    ;; we might mess up handling of atomic and side
+                    ;; window.
                     (setq new (split-window window size horizontal)))
                 ;; Give up if we can't resize window down to safe sizes.
                 (error "Cannot resize window %s" window))
@@ -3735,10 +3738,11 @@ value can be also stored on disk and read back in a new session."
   (dolist (item window-state-put-list)
     (let ((window (car item))
           (splits (cdr (assq 'splits item)))
-          (nest (cdr (assq 'nest item)))
+          (combination-limit (cdr (assq 'combination-limit item)))
           (parameters (cdr (assq 'parameters item)))
           (state (cdr (assq 'buffer item))))
-      (when nest (set-window-nest window nest))
+      (when combination-limit
+        (set-window-combination-limit window combination-limit))
       ;; Process parameters.
       (when parameters
         (dolist (parameter parameters)