0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 7.4.1611

Problem:    The versplit feature makes the code uneccessary complicated.
Solution:   Remove FEAT_VERTSPLIT, always support vertical splits when
            FEAT_WINDOWS is defined.
This commit is contained in:
Bram Moolenaar
2016-03-19 22:11:51 +01:00
parent cc6cf9b9f9
commit 44a2f923c0
31 changed files with 141 additions and 397 deletions

View File

@@ -1578,11 +1578,9 @@ qf_jump(
* specified, the current window is vertically split and narrow.
*/
flags = WSP_HELP;
# ifdef FEAT_VERTSPLIT
if (cmdmod.split == 0 && curwin->w_width != Columns
&& curwin->w_width < 80)
flags |= WSP_TOP;
# endif
if (qi != &ql_info)
flags |= WSP_NEWLOC; /* don't copy the location list */
@@ -2360,15 +2358,12 @@ ex_copen(exarg_T *eap)
win_goto(win);
if (eap->addr_count != 0)
{
#ifdef FEAT_VERTSPLIT
if (cmdmod.split & WSP_VERT)
{
if (height != W_WIDTH(win))
win_setwidth(height);
}
else
#endif
if (height != win->w_height)
else if (height != win->w_height)
win_setheight(height);
}
}
@@ -2425,11 +2420,7 @@ ex_copen(exarg_T *eap)
/* Only set the height when still in the same tab page and there is no
* window to the side. */
if (curtab == prevtab
#ifdef FEAT_VERTSPLIT
&& curwin->w_width == Columns
#endif
)
if (curtab == prevtab && curwin->w_width == Columns)
win_setheight(height);
curwin->w_p_wfh = TRUE; /* set 'winfixheight' */
if (win_valid(win))