summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/doc/options.txt6
-rw-r--r--runtime/doc/windows.txt13
-rw-r--r--src/version.c2
-rw-r--r--src/window.c49
4 files changed, 57 insertions, 13 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index eed885459..9ee985025 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.1. Last change: 2007 May 11
+*options.txt* For Vim version 7.1. Last change: 2007 Aug 10
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2415,8 +2415,8 @@ A jump table for the options with a short description can be found at |Q_op|.
When mixing vertically and horizontally split windows, a minimal size
is computed and some windows may be larger if there is room. The
'eadirection' option tells in which direction the size is affected.
- Changing the height of a window can be avoided by setting
- 'winfixheight'.
+ Changing the height and width of a window can be avoided by setting
+ 'winfixheight' and 'winfixwidth', respectively.
*'equalprg'* *'ep'*
'equalprg' 'ep' string (default "")
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 76c331060..f95b2da84 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -132,7 +132,8 @@ CTRL-W CTRL-S *CTRL-W_CTRL-S*
the same file. Make new window N high (default is to use half
the height of the current window). Reduces the current window
height to create room (and others, if the 'equalalways' option
- is set and 'eadirection' isn't "hor").
+ is set, 'eadirection' isn't "hor", and one of them is higher
+ than the current or the new window).
Note: CTRL-S does not work on all terminals and might block
further input, use CTRL-Q to get going again.
Also see |++opt| and |+cmd|.
@@ -140,9 +141,13 @@ CTRL-W CTRL-S *CTRL-W_CTRL-S*
CTRL-W CTRL-V *CTRL-W_CTRL-V*
CTRL-W v *CTRL-W_v*
:[N]vs[plit] [++opt] [+cmd] [file] *:vs* *:vsplit*
- Like |:split|, but split vertically. If 'equalalways' is set
- and 'eadirection' isn't "ver" the windows will be spread out
- horizontally, unless a width was specified.
+ Like |:split|, but split vertically. The windows will be
+ spread out horizontally if
+ 1. a width was not specified,
+ 2. 'equalalways' is set,
+ 3. 'eadirection' isn't "ver", and
+ 4. one of the other windows are wider than the current or new
+ window.
Note: In other places CTRL-Q does the same as CTRL-V, but here
it doesn't!
diff --git a/src/version.c b/src/version.c
index a3c141649..fb80f28fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 68,
+/**/
67,
/**/
66,
diff --git a/src/window.c b/src/window.c
index 289197225..b94fc34a5 100644
--- a/src/window.c
+++ b/src/window.c
@@ -733,7 +733,6 @@ win_split_ins(size, flags, newwin, dir)
if (flags & WSP_VERT)
{
layout = FR_ROW;
- do_equal = (p_ea && new_size == 0 && *p_ead != 'v');
/*
* Check if we are able to split the current window and compute its
@@ -770,16 +769,31 @@ win_split_ins(size, flags, newwin, dir)
* instead, if possible. */
if (oldwin->w_p_wfw)
win_setwidth_win(oldwin->w_width + new_size, oldwin);
+
+ /* Only make all windows the same width if one of them (except oldwin)
+ * is wider than one of the split windows. */
+ if (!do_equal && p_ea && size == 0 && *p_ead != 'v'
+ && oldwin->w_frame->fr_parent != NULL)
+ {
+ frp = oldwin->w_frame->fr_parent->fr_child;
+ while (frp != NULL)
+ {
+ if (frp->fr_win != oldwin && frp->fr_win != NULL
+ && (frp->fr_win->w_width > new_size
+ || frp->fr_win->w_width > oldwin->w_width
+ - new_size - STATUS_HEIGHT))
+ {
+ do_equal = TRUE;
+ break;
+ }
+ frp = frp->fr_next;
+ }
+ }
}
else
#endif
{
layout = FR_COL;
- do_equal = (p_ea && new_size == 0
-#ifdef FEAT_VERTSPLIT
- && *p_ead != 'h'
-#endif
- );
/*
* Check if we are able to split the current window and compute its
@@ -832,6 +846,29 @@ win_split_ins(size, flags, newwin, dir)
if (need_status)
oldwin_height -= STATUS_HEIGHT;
}
+
+ /* Only make all windows the same height if one of them (except oldwin)
+ * is higher than one of the split windows. */
+ if (!do_equal && p_ea && size == 0
+#ifdef FEAT_VERTSPLIT
+ && *p_ead != 'h'
+#endif
+ && oldwin->w_frame->fr_parent != NULL)
+ {
+ frp = oldwin->w_frame->fr_parent->fr_child;
+ while (frp != NULL)
+ {
+ if (frp->fr_win != oldwin && frp->fr_win != NULL
+ && (frp->fr_win->w_height > new_size
+ || frp->fr_win->w_height > oldwin_height - new_size
+ - STATUS_HEIGHT))
+ {
+ do_equal = TRUE;
+ break;
+ }
+ frp = frp->fr_next;
+ }
+ }
}
/*