patch 8.0.1566: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Graduate FEAT_SCROLLBIND and FEAT_CURSORBIND.
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index c0eed2d..0a51d8e 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -8263,20 +8263,18 @@
else if (win_split(eap->addr_count > 0 ? (int)eap->line2 : 0,
*eap->cmd == 'v' ? WSP_VERT : 0) != FAIL)
{
-# ifdef FEAT_SCROLLBIND
/* Reset 'scrollbind' when editing another file, but keep it when
* doing ":split" without arguments. */
if (*eap->arg != NUL
-# ifdef FEAT_BROWSE
+# ifdef FEAT_BROWSE
|| cmdmod.browse
-# endif
+# endif
)
{
RESET_BINDING(curwin);
}
else
do_check_scrollbind(FALSE);
-# endif
do_exedit(eap, old_curwin);
}
@@ -8768,7 +8766,6 @@
static void
ex_syncbind(exarg_T *eap UNUSED)
{
-#ifdef FEAT_SCROLLBIND
win_T *wp;
win_T *save_curwin = curwin;
buf_T *save_curbuf = curbuf;
@@ -8836,7 +8833,6 @@
ins_typebuf(ctrl_o, REMAP_NONE, 0, TRUE, FALSE);
}
}
-#endif
}