diff options
| author | Florian Walch <florian@fwalch.com> | 2016-01-24 13:02:14 +0100 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2016-01-24 13:02:14 +0100 |
| commit | a15cfb4d52c5d9098da98059592d8ca79e03c5d9 (patch) | |
| tree | 8b770c05f6b24f4b6375b95f26cd09695c11f01a /src | |
| parent | c5f37c0fc0bffcb7be4e45eec38879025f255353 (diff) | |
| parent | 3915ac24097619033144d68de1e9e2a750215f61 (diff) | |
| download | rneovim-a15cfb4d52c5d9098da98059592d8ca79e03c5d9.tar.gz rneovim-a15cfb4d52c5d9098da98059592d8ca79e03c5d9.tar.bz2 rneovim-a15cfb4d52c5d9098da98059592d8ca79e03c5d9.zip | |
Merge pull request #4089 from jbradaric/vim-7.4.722
vim-patch:7.4.722
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/message.c | 3 | ||||
| -rw-r--r-- | src/nvim/screen.c | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index 00f4c0a85c..1dd71baaa4 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -1396,7 +1396,8 @@ void msg_prt_line(char_u *s, int list) c = *p_extra++; } else if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) { col += (*mb_ptr2cells)(s); - if (lcs_nbsp != NUL && list && mb_ptr2char(s) == 160) { + if (lcs_nbsp != NUL && list + && (mb_ptr2char(s) == 160 || mb_ptr2char(s) == 0x202f)) { mb_char2bytes(lcs_nbsp, buf); buf[(*mb_ptr2len)(buf)] = NUL; } else { diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 9a64a7c3a9..c6d1ea790e 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -3202,7 +3202,8 @@ win_line ( // '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 == 160 || (mb_utf8 && (mb_c == 160 || mb_c == 0x202f))) + && lcs_nbsp) || (c == ' ' && lcs_space && ptr - line <= trailcol))) { c = (c == ' ') ? lcs_space : lcs_nbsp; if (area_attr == 0 && search_attr == 0) { diff --git a/src/nvim/version.c b/src/nvim/version.c index edffe357ea..7c7839f7e7 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -402,7 +402,7 @@ static int included_patches[] = { // 725, // 724 NA 723, - // 722, + 722, 721, // 720 NA 719, |