summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-06-25 17:58:11 +0200
committerBram Moolenaar <Bram@vim.org>2014-06-25 17:58:11 +0200
commit41d75239863d4b7a4142fc68cfa5d3a74a18d935 (patch)
treefb23ca67937d14eefe2ab39cb2629f77a59494b3
parentdb5ffaab5a4755981ee7eff2f044b533ce3042a9 (diff)
downloadvim-git-41d75239863d4b7a4142fc68cfa5d3a74a18d935.tar.gz
updated for version 7.4.343v7.4.343
Problem: matchdelete() does not always update the right lines. Solution: Fix off-by-one error. (Ozaki Kiichi)
-rw-r--r--src/version.c2
-rw-r--r--src/window.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/version.c b/src/version.c
index 3fdfae549..8282a834b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 343,
+/**/
342,
/**/
341,
diff --git a/src/window.c b/src/window.c
index ae82fe7db..914f88e0b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6891,8 +6891,8 @@ match_add(wp, grp, pat, prio, id, pos_list)
}
if (toplnum == 0 || lnum < toplnum)
toplnum = lnum;
- if (botlnum == 0 || lnum > botlnum)
- botlnum = lnum;
+ if (botlnum == 0 || lnum >= botlnum)
+ botlnum = lnum + 1;
}
/* Calculate top and bottom lines for redrawing area */