summaryrefslogtreecommitdiff
path: root/lisp/cus-start.el
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2011-11-16 11:10:40 +0100
committerMartin Rudalics <rudalics@gmx.at>2011-11-16 11:10:40 +0100
commitb6f6789018b0bd41368126cfb45307334d6ff4d6 (patch)
treeeb2f35085b12fa731c3dcfdb82ac97abafc913a7 /lisp/cus-start.el
parentce7ddba00114b8876179e87c222fd8697da19ac0 (diff)
downloademacs-b6f6789018b0bd41368126cfb45307334d6ff4d6.tar.gz
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.
Diffstat (limited to 'lisp/cus-start.el')
-rw-r--r--lisp/cus-start.el2
1 files changed, 1 insertions, 1 deletions
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)