diff -r 36d22bbf4c5c runtime/doc/options.txt
--- a/runtime/doc/options.txt	Thu Oct 09 17:05:56 2014 +0200
+++ b/runtime/doc/options.txt	Fri Oct 10 15:17:24 2014 +0200
@@ -4703,31 +4703,35 @@
 			{not in Vi}
 	Strings to use in 'list' mode and for the |:list| command.  It is a
 	comma separated list of string settings.
-	  						*lcs-eol*
+							*lcs-eol*
 	  eol:c		Character to show at the end of each line.  When
 			omitted, there is no extra character at the end of the
 			line.
-	  						*lcs-tab*
+							*lcs-tab*
 	  tab:xy	Two characters to be used to show a tab.  The first
 			char is used once.  The second char is repeated to
 			fill the space that the tab normally occupies.
 			"tab:>-" will show a tab that takes four spaces as
 			">---".  When omitted, a tab is show as ^I.
-	  						*lcs-trail*
+							*lcs-space*
+	  space:c	Character to show for a space.  When omitted, spaces
+			are left blank.
+							*lcs-trail*
 	  trail:c	Character to show for trailing spaces.  When omitted,
-			trailing spaces are blank.
-	  						*lcs-extends*
+			trailing spaces are blank.  Overrides the "space"
+			setting for trailing spaces.
+							*lcs-extends*
 	  extends:c	Character to show in the last column, when 'wrap' is
 			off and the line continues beyond the right of the
 			screen.
-	  						*lcs-precedes*
+							*lcs-precedes*
 	  precedes:c	Character to show in the first column, when 'wrap'
 			is off and there is text preceding the character
 			visible in the first column.
-	  						*lcs-conceal*
+							*lcs-conceal*
 	  conceal:c	Character to show in place of concealed text, when
 			'conceallevel' is set to 1.
-	  						*lcs-nbsp*
+							*lcs-nbsp*
 	  nbsp:c	Character to show for a non-breakable space (character
 			0xA0, 160).  Left blank when omitted.
 
@@ -4740,7 +4744,7 @@
 	    :set lcs=tab:>-,eol:<,nbsp:%
 	    :set lcs=extends:>,precedes:<
 <	The "NonText" highlighting will be used for "eol", "extends" and
-	"precedes".  "SpecialKey" for "nbsp", "tab" and "trail".
+	"precedes".  "SpecialKey" for "nbsp", "space", "tab" and "trail".
 	|hl-NonText| |hl-SpecialKey|
 
 			*'lpl'* *'nolpl'* *'loadplugins'* *'noloadplugins'*
diff -r 36d22bbf4c5c src/globals.h
--- a/src/globals.h	Thu Oct 09 17:05:56 2014 +0200
+++ b/src/globals.h	Fri Oct 10 15:17:24 2014 +0200
@@ -1163,6 +1163,7 @@
 EXTERN int	lcs_ext INIT(= NUL);
 EXTERN int	lcs_prec INIT(= NUL);
 EXTERN int	lcs_nbsp INIT(= NUL);
+EXTERN int	lcs_space INIT(= NUL);
 EXTERN int	lcs_tab1 INIT(= NUL);
 EXTERN int	lcs_tab2 INIT(= NUL);
 EXTERN int	lcs_trail INIT(= NUL);
diff -r 36d22bbf4c5c src/message.c
--- a/src/message.c	Thu Oct 09 17:05:56 2014 +0200
+++ b/src/message.c	Fri Oct 10 15:17:24 2014 +0200
@@ -1761,6 +1761,11 @@
 		c = lcs_trail;
 		attr = hl_attr(HLF_8);
 	    }
+	    else if (c == ' ' && list && lcs_space != NUL)
+	    {
+		c = lcs_space;
+		attr = hl_attr(HLF_8);
+	    }
 	}
 
 	if (c == NUL)
diff -r 36d22bbf4c5c src/option.c
--- a/src/option.c	Thu Oct 09 17:05:56 2014 +0200
+++ b/src/option.c	Fri Oct 10 15:17:24 2014 +0200
@@ -7321,6 +7321,7 @@
 	{&lcs_ext,	"extends"},
 	{&lcs_nbsp,	"nbsp"},
 	{&lcs_prec,	"precedes"},
+	{&lcs_space,	"space"},
 	{&lcs_tab2,	"tab"},
 	{&lcs_trail,	"trail"},
 #ifdef FEAT_CONCEAL
diff -r 36d22bbf4c5c src/screen.c
--- a/src/screen.c	Thu Oct 09 17:05:56 2014 +0200
+++ b/src/screen.c	Fri Oct 10 15:17:24 2014 +0200
@@ -4271,14 +4271,16 @@
 #endif
 	    ++ptr;
 
-	    /* 'list' : change char 160 to lcs_nbsp. */
-	    if (wp->w_p_list && (c == 160
-#ifdef FEAT_MBYTE
-			|| (mb_utf8 && mb_c == 160)
-#endif
-			) && lcs_nbsp)
-	    {
-		c = lcs_nbsp;
+	    /* 'list': change char 160 to lcs_nbsp and space to lcs_space. */
+	    if (wp->w_p_list
+		    && (((c == 160
+#ifdef FEAT_MBYTE
+			  || (mb_utf8 && mb_c == 160)
+#endif
+			 ) && lcs_nbsp)
+			|| (c == ' ' && lcs_space && ptr <= line + trailcol)))
+	    {
+		c = (c == ' ') ? lcs_space : lcs_nbsp;
 		if (area_attr == 0 && search_attr == 0)
 		{
 		    n_attr = 1;
diff -r 36d22bbf4c5c src/testdir/Makefile
--- a/src/testdir/Makefile	Thu Oct 09 17:05:56 2014 +0200
+++ b/src/testdir/Makefile	Fri Oct 10 15:17:24 2014 +0200
@@ -38,6 +38,7 @@
 		test_changelist.out \
 		test_eval.out \
 		test_insertcount.out \
+		test_listchars.out \
 		test_listlbr.out \
 		test_listlbr_utf8.out \
 		test_options.out \
diff -r 36d22bbf4c5c src/testdir/test_listchars.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/testdir/test_listchars.in	Fri Oct 10 15:17:24 2014 +0200
@@ -0,0 +1,53 @@
+Tests for 'listchars' display with 'list' and :list
+
+STARTTEST
+:so small.vim
+:let g:lines = []
+:function GetScreenCharsForLine(lnum)
+:  return join(map(range(1, virtcol('$')), 'nr2char(screenchar(a:lnum, v:val))'), '')
+:endfunction
+:nnoremap <expr> GG ":call add(g:lines, GetScreenCharsForLine(".screenrow()."))\<CR>"
+:set listchars+=tab:>-,space:.,trail:<
+:set list
+:
+/^start:/
+:normal! jzt
+GG
+GG
+GG
+GG
+GGH:
+:set listchars-=trail:<
+GG
+GG
+GG
+GG
+GG:
+:put =g:lines
+:'[,']w! test.out
+ENDTEST
+
+start:
+	aa	
+  bb	  
+   cccc	 
+dd        ee  	
+ 
+
+
+STARTTEST
+:set listchars+=trail:<
+:set nolist
+:
+/^start:/
+:redir! >> test.out
+:+1,$list
+:redir END
+:q!
+ENDTEST
+
+start:
+  fff	  
+	gg	
+     h	
+iii    	  
diff -r 36d22bbf4c5c src/testdir/test_listchars.ok
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/testdir/test_listchars.ok	Fri Oct 10 15:17:24 2014 +0200
@@ -0,0 +1,16 @@
+>-------aa>-----$
+..bb>---<<$
+...cccc><$
+dd........ee<<>-$
+<$
+>-------aa>-----$
+..bb>---..$
+...cccc>.$
+dd........ee..>-$
+.$
+
+
+..fff>--<<$
+>-------gg>-----$
+.....h>-$
+iii<<<<><<$