summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-03-11 16:47:21 +0000
committerBram Moolenaar <Bram@vim.org>2009-03-11 16:47:21 +0000
commitf837ef9e7b1a8de49f194e8d3b3cca397e97d2af (patch)
treed4cb4bdd50ea92c7cf86acfa249ec5ebc83aedaf
parent552c8a567733abb21c0df4bf2174ad5cbab1cdfb (diff)
updated for version 7.2-140v7.2.140
-rw-r--r--src/screen.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index 6d408eb925..79cd689d0d 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3555,7 +3555,8 @@ win_line(wp, lnum, startrow, endrow, nochange)
/* Use line_attr when not in the Visual or 'incsearch' area
* (area_attr may be 0 when "noinvcur" is set). */
else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL)
- || (vcol < fromcol || vcol >= tocol)))
+ || vcol < fromcol || vcol_prev < fromcol_prev
+ || vcol >= tocol))
char_attr = line_attr;
#endif
else
diff --git a/src/version.c b/src/version.c
index 541fac6702..2add8486cf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 140,
+/**/
139,
/**/
138,