summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-02-21 20:23:59 +0000
committerBram Moolenaar <Bram@vim.org>2009-02-21 20:23:59 +0000
commitfa363cd16f9ef3248331165f9d45fa3b648e7e5c (patch)
tree341be78ab790a0b5138d508c63f190061340f32a /src
parent54ef7116a0edede2f2b6b9393d9193effbb745b6 (diff)
downloadvim-git-fa363cd16f9ef3248331165f9d45fa3b648e7e5c.tar.gz
updated for version 7.2-112v7.2.112
Diffstat (limited to 'src')
-rw-r--r--src/screen.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/screen.c b/src/screen.c
index f395bd0fb..72e20ba7f 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3422,6 +3422,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
&& (*mb_ptr2cells)(ptr) > 1)
#endif
|| ((int)vcol_prev == fromcol_prev
+ && vcol_prev < vcol /* not at margin */
&& vcol < tocol))
area_attr = attr; /* start highlighting */
else if (area_attr != 0
diff --git a/src/version.c b/src/version.c
index f724afd5b..9b8ac51f2 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 */
/**/
+ 112,
+/**/
111,
/**/
110,