diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2011-11-12 10:55:50 +0100 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2011-11-12 10:55:50 +0100 |
| commit | 89d612214e95564c06c775189f8994001e3e1c06 (patch) | |
| tree | 262c97bdc2d5fa06d2ec6bfcba6de680c8b3cb01 /lisp | |
| parent | 98282f6f12089e9badd8da4132cd8818b3fd8f0b (diff) | |
| download | emacs-89d612214e95564c06c775189f8994001e3e1c06.tar.gz | |
Don't handle splits status.
* window.h (window): Remove splits slot.
* window.c (Fwindow_splits, Fset_window_splits): Remove.
(Fdelete_other_windows_internal, make_parent_window)
(make_window, Fsplit_window_internal, Fdelete_window_internal)
(Fset_window_configuration, save_window_save): Don't deal with
split status of windows.
(saved_window): Remove splits slot.
(Vwindow_splits): Rewrite doc-string.
* window.el (window-resize, delete-window): Use window-splits
variable instead of function.
(window-state-get-1, window-state-put-2, window-state-put):
Don't deal with windows' splits status.
* windows.texi (Splitting Windows, Deleting Windows): Remove
references to splits status of windows.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/window.el | 13 |
2 files changed, 12 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b0e433c7cb..8f28e033419 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2011-11-12 Martin Rudalics <rudalics@gmx.at> + + * window.el (window-resize, delete-window): Use window-splits + variable instead of function. + (window-state-get-1, window-state-put-2, window-state-put): + Don't deal with windows' splits status. + 2011-11-12 Glenn Morris <rgm@gnu.org> * apropos.el (apropos-do-all, apropos-library, apropos-value) diff --git a/lisp/window.el b/lisp/window.el index 41b397730d1..7b16d6b886f 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -1482,12 +1482,12 @@ instead." ((window--resizable-p window delta horizontal ignore) (window--resize-reset frame horizontal) (window--resize-this-window window delta horizontal ignore t) - (if (and (not (window-splits window)) + (if (and (not window-splits) (window-combined-p window horizontal) (setq sibling (or (window-right window) (window-left window))) (window-sizable-p sibling (- delta) horizontal ignore)) - ;; If window-splits returns nil for WINDOW, WINDOW is part of - ;; an iso-combination, and WINDOW's neighboring right or left + ;; If window-splits is nil, WINDOW is part of an + ;; iso-combination, and WINDOW's neighboring right or left ;; sibling can be resized as requested, resize that sibling. (let ((normal-delta (/ (float delta) @@ -2389,8 +2389,7 @@ non-side window, signal an error." (sibling (or (window-left window) (window-right window)))) (window--resize-reset frame horizontal) (cond - ((and (not (window-splits window)) - sibling (window-sizable-p sibling size)) + ((and (not window-splits) sibling (window-sizable-p sibling size)) ;; Resize WINDOW's sibling. (window--resize-this-window sibling size horizontal nil t) (set-window-new-normal @@ -3585,7 +3584,6 @@ specific buffers." (total-width . ,(window-total-size window t)) (normal-height . ,(window-normal-size window)) (normal-width . ,(window-normal-size window t)) - (splits . ,(window-splits window)) (nest . ,(window-nest window)) ,@(let (list) (dolist (parameter (window-parameters window)) @@ -3740,7 +3738,6 @@ value can be also stored on disk and read back in a new session." (nest (cdr (assq 'nest item))) (parameters (cdr (assq 'parameters item))) (state (cdr (assq 'buffer item)))) - (when splits (set-window-splits window splits)) (when nest (set-window-nest window nest)) ;; Process parameters. (when parameters @@ -3828,7 +3825,7 @@ windows can get as small as `window-safe-min-height' and (cdr (assq 'total-width state))))) (min-height (cdr (assq 'min-height head))) (min-width (cdr (assq 'min-width head))) - window-splits selected) + selected) (if (and (not totals) (or (> min-height (window-total-size window)) (> min-width (window-total-size window t))) |