0
0
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00

patch 7.4.722

Problem:    0x202f is not recognized as a non-breaking space character.
Solution:   Add 0x202f to the list. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2015-05-04 17:28:22 +02:00
parent d59c099120
commit 73284b973a
4 changed files with 9 additions and 4 deletions

View File

@@ -4746,8 +4746,9 @@ A jump table for the options with a short description can be found at |Q_op|.
conceal:c Character to show in place of concealed text, when conceal:c Character to show in place of concealed text, when
'conceallevel' is set to 1. 'conceallevel' is set to 1.
*lcs-nbsp* *lcs-nbsp*
nbsp:c Character to show for a non-breakable space (character nbsp:c Character to show for a non-breakable space character
0xA0, 160). Left blank when omitted. (0xA0 (160 decimal) and U+202F). Left blank when
omitted.
The characters ':' and ',' should not be used. UTF-8 characters can The characters ':' and ',' should not be used. UTF-8 characters can
be used when 'encoding' is "utf-8", otherwise only printable be used when 'encoding' is "utf-8", otherwise only printable

View File

@@ -1697,7 +1697,9 @@ msg_prt_line(s, list)
else if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) else if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1)
{ {
col += (*mb_ptr2cells)(s); 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); mb_char2bytes(lcs_nbsp, buf);
buf[(*mb_ptr2len)(buf)] = NUL; buf[(*mb_ptr2len)(buf)] = NUL;

View File

@@ -4338,7 +4338,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
if (wp->w_p_list if (wp->w_p_list
&& (((c == 160 && (((c == 160
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
|| (mb_utf8 && mb_c == 160) || (mb_utf8 && (mb_c == 160 || mb_c == 0x202f))
#endif #endif
) && lcs_nbsp) ) && lcs_nbsp)
|| (c == ' ' && lcs_space && ptr - line <= trailcol))) || (c == ' ' && lcs_space && ptr - line <= trailcol)))

View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
722,
/**/ /**/
721, 721,
/**/ /**/