Mercurial > vim
diff src/main.c @ 13384:6740c499de13 v8.0.1566
patch 8.0.1566: too many #ifdefs
commit https://github.com/vim/vim/commit/8a3bb56230d220b8e1b4dcca517ed95f5341b8c7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 4 20:14:14 2018 +0100
patch 8.0.1566: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Graduate FEAT_SCROLLBIND and FEAT_CURSORBIND.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 04 Mar 2018 20:15:05 +0100 |
| parents | 69517d67421f |
| children | cf7cd0272011 |
line wrap: on
line diff
--- 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)