aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJurica Bradaric <jbradaric@gmail.com>2016-01-14 10:58:12 +0100
committerJurica Bradaric <jurica.bradaric@avl.com>2016-01-19 08:25:54 +0100
commit21afabb9e8cf335fb60c027bbb064de07d1bf586 (patch)
treeccae65a1d09c4fb19249ccb18e159c274acbf4db /src
parentee0e214427d7ed2a9fd8ffc85c424cfffc927408 (diff)
downloadrneovim-21afabb9e8cf335fb60c027bbb064de07d1bf586.tar.gz
rneovim-21afabb9e8cf335fb60c027bbb064de07d1bf586.tar.bz2
rneovim-21afabb9e8cf335fb60c027bbb064de07d1bf586.zip
vim-patch:7.4.729
Problem: Occasional crash with 'list' set. Solution: Fix off-by-one error. (Christian Brabandt)
Diffstat (limited to 'src')
-rw-r--r--src/nvim/screen.c2
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 1ae2822a93..700612900a 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -3469,7 +3469,7 @@ win_line (
&& !(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. */
/* For a diff line the highlighting continues after the
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 8c9faac0c3..e221001e35 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -395,7 +395,7 @@ static int included_patches[] = {
// 732,
// 731 NA
// 730 NA
- // 729,
+ 729,
// 728 NA
// 727 NA
// 726 NA