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
commita6cd15b6dd62ba36d7c3fe46eb05efa045cd8943 (patch)
treeee95acef2da80102b6783b93dab2834db751a7fd
parentf5a4f219c8f83ac96c0b8bd03ed79880be0e0c78 (diff)
downloadvim-a6cd15b6dd62ba36d7c3fe46eb05efa045cd8943.tar.gz
patch 7.4.729v7.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 3f3123ad..917a0eaa 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 b469a6dd..355aa06f 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,