summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-10-10 15:28:46 +0200
committerBram Moolenaar <Bram@vim.org>2014-10-10 15:28:46 +0200
commit7425b938cb5fc5b12c4342d9c4834c535f5bf772 (patch)
tree435960cda1a3dd2617c144be47f75827bacc7dd7 /src
parentf191d55ede59883b09b35bfe92ea6e2a63058369 (diff)
downloadvim-7425b938cb5fc5b12c4342d9c4834c535f5bf772.zip
updated for version 7.4.472
Problem: The "precedes" entry in 'listchar' will be drawn when 'showbreak is set and list is not. Solution: Only draw this character when 'list' is on. (Christian Brabandt)
Diffstat (limited to 'src')
-rw-r--r--src/screen.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/screen.c b/src/screen.c
index fae2703f7..36afc2dcd 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4901,6 +4901,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
* special character (via 'listchars' option "precedes:<char>".
*/
if (lcs_prec_todo != NUL
+ && wp->w_p_list
&& (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0)
#ifdef FEAT_DIFF
&& filler_todo <= 0
diff --git a/src/version.c b/src/version.c
index 3be907b11..f22d195a1 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 */
/**/
+ 472,
+/**/
471,
/**/
470,