diff options
author | Bram Moolenaar <Bram@vim.org> | 2011-03-22 13:29:24 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2011-03-22 13:29:24 +0100 |
commit | e9d4b58dda5ce38389617079722cf9bfcd966599 (patch) | |
tree | 16dd471f418bbbee38c43019f65172bbfd12beaa | |
parent | fd30cd41dc61e293e567ccb83d7ee0ce8fdc14eb (diff) |
updated for version 7.3.140v7.3.140
Problem: Crash when drawing the "$" at end-of-line for list mode just after
the window border and 'cursorline' is set.
Solution: Don't check for 'cursorline'. (Quentin Carbonneaux)
-rw-r--r-- | src/screen.c | 6 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/screen.c b/src/screen.c index ab08cf74de..1726fac82a 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 30ab39a086..d24bf7dba6 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, |