summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/screen.c6
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/screen.c b/src/screen.c
index ab08cf74d..1726fac82 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -5099,11 +5099,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
#ifdef FEAT_DIFF
|| filler_todo > 0
#endif
- || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str
-#ifdef FEAT_SYN_HL
- && !wp->w_p_cul
-#endif
- )
+ || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str)
|| (n_extra != 0 && (c_extra != NUL || *p_extra != NUL)))
)
{
diff --git a/src/version.c b/src/version.c
index 30ab39a08..d24bf7dba 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 140,
+/**/
139,
/**/
138,