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.
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 12730a9..26f4219 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2013,7 +2013,7 @@
case 'v': if (checkforcmd(&ea.cmd, "vertical", 4))
{
-#ifdef FEAT_VERTSPLIT
+#ifdef FEAT_WINDOWS
cmdmod.split |= WSP_VERT;
#endif
continue;
@@ -7923,14 +7923,6 @@
int browse_flag = cmdmod.browse;
# endif
-# ifndef FEAT_VERTSPLIT
- if (eap->cmdidx == CMD_vsplit || eap->cmdidx == CMD_vnew)
- {
- ex_ni(eap);
- return;
- }
-# endif
-
# ifdef FEAT_GUI
need_mouse_correct = TRUE;
# endif
@@ -7942,10 +7934,8 @@
{
if (eap->cmdidx == CMD_split)
eap->cmdidx = CMD_new;
-# ifdef FEAT_VERTSPLIT
if (eap->cmdidx == CMD_vsplit)
eap->cmdidx = CMD_vnew;
-# endif
}
# endif
@@ -7964,9 +7954,7 @@
# endif
# ifdef FEAT_BROWSE
if (cmdmod.browse
-# ifdef FEAT_VERTSPLIT
&& eap->cmdidx != CMD_vnew
-# endif
&& eap->cmdidx != CMD_new)
{
# ifdef FEAT_AUTOCMD
@@ -8224,11 +8212,10 @@
;
}
-#ifdef FEAT_GUI
+# ifdef FEAT_GUI
need_mouse_correct = TRUE;
-#endif
+# endif
n = atol((char *)eap->arg);
-#ifdef FEAT_VERTSPLIT
if (cmdmod.split & WSP_VERT)
{
if (*eap->arg == '-' || *eap->arg == '+')
@@ -8238,7 +8225,6 @@
win_setwidth_win((int)n, wp);
}
else
-#endif
{
if (*eap->arg == '-' || *eap->arg == '+')
n += curwin->w_height;
@@ -8397,7 +8383,7 @@
if ((eap->cmdidx == CMD_new
|| eap->cmdidx == CMD_tabnew
|| eap->cmdidx == CMD_tabedit
-#ifdef FEAT_VERTSPLIT
+#ifdef FEAT_WINDOWS
|| eap->cmdidx == CMD_vnew
#endif
) && *eap->arg == NUL)
@@ -8409,7 +8395,7 @@
old_curwin == NULL ? curwin : NULL);
}
else if ((eap->cmdidx != CMD_split
-#ifdef FEAT_VERTSPLIT
+#ifdef FEAT_WINDOWS
&& eap->cmdidx != CMD_vsplit
#endif
)