diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-04-27 04:59:45 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-04-27 04:59:45 -0400 |
| commit | d9441444afa3e99c8116ad01b11614886aa53524 (patch) | |
| tree | 4738a37175e40cda2a1d2aac2dfa4bdf2dcaed41 /src/nvim/screen.c | |
| parent | 5a1a2ba783ba174567ff1c1044b9f0b01b61a0fb (diff) | |
| parent | 2632dc5890744085e8cb24a644a50f7e32a92c03 (diff) | |
| download | rneovim-d9441444afa3e99c8116ad01b11614886aa53524.tar.gz rneovim-d9441444afa3e99c8116ad01b11614886aa53524.tar.bz2 rneovim-d9441444afa3e99c8116ad01b11614886aa53524.zip | |
Merge #2492 'vim-patch:7.4.710-712'
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index c9a2e147dc..a680599f9b 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -3165,11 +3165,11 @@ win_line ( } ++ptr; - /* 'list' : change char 160 to lcs_nbsp. */ - if (wp->w_p_list && (c == 160 - || (mb_utf8 && mb_c == 160) - ) && lcs_nbsp) { - c = lcs_nbsp; + // 'list': change char 160 to lcs_nbsp and space to lcs_space. + if (wp->w_p_list + && (((c == 160 || (mb_utf8 && mb_c == 160)) && lcs_nbsp) + || (c == ' ' && lcs_space && ptr <= line + trailcol))) { + c = (c == ' ') ? lcs_space : lcs_nbsp; if (area_attr == 0 && search_attr == 0) { n_attr = 1; extra_attr = hl_attr(HLF_8); |