diff options
author | Bram Moolenaar <Bram@vim.org> | 2018-03-04 20:14:14 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2018-03-04 20:14:14 +0100 |
commit | 8a3bb56230d220b8e1b4dcca517ed95f5341b8c7 (patch) | |
tree | e1d195050f92f44fc1993ca016c07611cb6faaa7 /src/window.c | |
parent | 107279c17b3a21899e0a9d0293ada040216539ba (diff) | |
download | vim-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/window.c')
-rw-r--r-- | src/window.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/window.c b/src/window.c index 23c324b5b..337f84dee 100644 --- a/src/window.c +++ b/src/window.c @@ -4498,9 +4498,7 @@ win_alloc(win_T *after UNUSED, int hidden UNUSED) #endif new_wp->w_botline = 2; new_wp->w_cursor.lnum = 1; -#ifdef FEAT_SCROLLBIND new_wp->w_scbind_pos = 1; -#endif /* We won't calculate w_fraction until resizing the window */ new_wp->w_fraction = 0; @@ -5659,11 +5657,7 @@ scroll_to_fraction(win_T *wp, int prev_height) /* Don't change w_topline when height is zero. Don't set w_topline when * 'scrollbind' is set and this isn't the current window. */ - if (height > 0 -#ifdef FEAT_SCROLLBIND - && (!wp->w_p_scb || wp == curwin) -#endif - ) + if (height > 0 && (!wp->w_p_scb || wp == curwin)) { /* * Find a value for w_topline that shows the cursor at the same |