0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 8.0.1566: too many #ifdefs

Problem:    Too many #ifdefs.
Solution:   Graduate FEAT_SCROLLBIND and FEAT_CURSORBIND.
This commit is contained in:
Bram Moolenaar
2018-03-04 20:14:14 +01:00
parent 107279c17b
commit 8a3bb56230
19 changed files with 19 additions and 142 deletions

View File

@@ -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