0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 8.1.1901: the +insert_expand feature is not always available

Problem:    The +insert_expand feature is not always available.
Solution:   Graduate the +insert_expand feature.
This commit is contained in:
Bram Moolenaar
2019-08-21 14:37:09 +02:00
parent d933c82ff4
commit e2c453d38f
34 changed files with 85 additions and 383 deletions

View File

@@ -136,10 +136,7 @@ redraw_for_cursorline(win_T *wp)
#endif
)
&& (wp->w_valid & VALID_CROW) == 0
#ifdef FEAT_INS_EXPAND
&& !pum_visible()
#endif
)
&& !pum_visible())
{
if (wp->w_p_rnu)
// win_line() will redraw the number column only.
@@ -816,11 +813,7 @@ validate_virtcol_win(win_T *wp)
getvvcol(wp, &wp->w_cursor, NULL, &(wp->w_virtcol), NULL);
wp->w_valid |= VALID_VIRTCOL;
#ifdef FEAT_SYN_HL
if (wp->w_p_cuc
# ifdef FEAT_INS_EXPAND
&& !pum_visible()
# endif
)
if (wp->w_p_cuc && !pum_visible())
redraw_win_later(wp, SOME_VALID);
#endif
}
@@ -1179,10 +1172,7 @@ curs_columns(
#ifdef FEAT_SYN_HL
/* Redraw when w_virtcol changes and 'cursorcolumn' is set */
if (curwin->w_p_cuc && (curwin->w_valid & VALID_VIRTCOL) == 0
# ifdef FEAT_INS_EXPAND
&& !pum_visible()
# endif
)
&& !pum_visible())
redraw_later(SOME_VALID);
#endif
@@ -1515,7 +1505,6 @@ max_topfill(void)
}
#endif
#if defined(FEAT_INS_EXPAND) || defined(PROTO)
/*
* Scroll the screen one line down, but don't do it if it would move the
* cursor off the screen.
@@ -1634,7 +1623,6 @@ scrollup_clamp(void)
curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE);
}
}
#endif /* FEAT_INS_EXPAND */
/*
* Add one line above "lp->lnum". This can be a filler line, a closed fold or