summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-05-14 05:56:09 +0200
committerBram Moolenaar <Bram@vim.org>2015-05-14 05:56:09 +0200
commit0481fee48800817bee206bb2f958fe04be4d8db6 (patch)
treec5a2586bd4b7e1160c5858e447c4af3e8f3a1e44
parent4270496716fe851213e03bea7bd4368cc01ff807 (diff)
downloadvim-git-0481fee48800817bee206bb2f958fe04be4d8db6.tar.gz
patch 7.4.729v7.4.729
Problem: Occasional crash with 'list' set. Solution: Fix off-by-one error. (Christian Brabandt)
-rw-r--r--src/screen.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index 3f3123adb..917a0eaa9 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4715,7 +4715,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
&& !(noinvcur
&& lnum == wp->w_cursor.lnum
&& (colnr_T)vcol == wp->w_virtcol)))
- && lcs_eol_one >= 0)
+ && lcs_eol_one > 0)
{
/* Display a '$' after the line or highlight an extra
* character if the line break is included. */
diff --git a/src/version.c b/src/version.c
index b469a6ddf..355aa06f2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 729,
+/**/
728,
/**/
727,