summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-05-04 16:52:01 +0200
committerBram Moolenaar <Bram@vim.org>2015-05-04 16:52:01 +0200
commitd59c099120919d2d77b431308e390f86c594c825 (patch)
tree8938c5ac8920a462d6312a980833a59193093fb2
parentf300ad230bc394556aac070faa88ca1667ffbfa2 (diff)
downloadvim-git-d59c099120919d2d77b431308e390f86c594c825.tar.gz
patch 7.4.721v7.4.721
Problem: When 'list' is set Visual mode does not highlight anything in empty lines. (mgaleski) Solution: Check the value of lcs_eol in another place. (Christian Brabandt)
-rw-r--r--src/screen.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/screen.c b/src/screen.c
index a0e9fc9fb..e210ec8c9 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4703,7 +4703,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
}
}
else if (c == NUL
- && ((wp->w_p_list && lcs_eol > 0)
+ && (wp->w_p_list
|| ((fromcol >= 0 || fromcol_prev >= 0)
&& tocol > vcol
&& VIsual_mode != Ctrl_V
@@ -4749,7 +4749,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
c_extra = NUL;
}
}
- if (wp->w_p_list)
+ if (wp->w_p_list && lcs_eol > 0)
c = lcs_eol;
else
c = ' ';
diff --git a/src/version.c b/src/version.c
index 8e0edfbd3..1be013492 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 */
/**/
+ 721,
+/**/
720,
/**/
719,