summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-03-04 20:14:14 +0100
committerBram Moolenaar <Bram@vim.org>2018-03-04 20:14:14 +0100
commit8a3bb56230d220b8e1b4dcca517ed95f5341b8c7 (patch)
treee1d195050f92f44fc1993ca016c07611cb6faaa7 /src/main.c
parent107279c17b3a21899e0a9d0293ada040216539ba (diff)
downloadvim-git-8a3bb56230d220b8e1b4dcca517ed95f5341b8c7.tar.gz
patch 8.0.1566: too many #ifdefsv8.0.1566
Problem: Too many #ifdefs. Solution: Graduate FEAT_SCROLLBIND and FEAT_CURSORBIND.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 406635a16..ff01fd968 100644
--- a/src/main.c
+++ b/src/main.c
@@ -857,7 +857,7 @@ vim_main2(void)
}
#endif
-#if defined(FEAT_DIFF) && defined(FEAT_SCROLLBIND)
+#if defined(FEAT_DIFF)
/* When a startup script or session file setup for diff'ing and
* scrollbind, sync the scrollbind now. */
if (curwin->w_p_diff && curwin->w_p_scb)
@@ -1193,7 +1193,7 @@ main_loop(
curbuf->b_last_changedtick = CHANGEDTICK(curbuf);
}
-#if defined(FEAT_DIFF) && defined(FEAT_SCROLLBIND)
+#if defined(FEAT_DIFF)
/* Scroll-binding for diff mode may have been postponed until
* here. Avoids doing it for every change. */
if (diff_need_scrollbind)