summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2015-05-04 17:28:22 +0200
committerBram Moolenaar <bram@vim.org>2015-05-04 17:28:22 +0200
commit4250c560739ec06334220a1301c8d945ff1cd718 (patch)
tree94799741a967efb07f1f14eed6189ae2c2d4743f
parent6a880f09ce813487f4896b75c2cfbc84ef268be6 (diff)
downloadvim-4250c560739ec06334220a1301c8d945ff1cd718.tar.gz
patch 7.4.722v7.4.722v7-4-722
Problem: 0x202f is not recognized as a non-breaking space character. Solution: Add 0x202f to the list. (Christian Brabandt)
-rw-r--r--runtime/doc/options.txt5
-rw-r--r--src/message.c4
-rw-r--r--src/screen.c2
-rw-r--r--src/version.c2
4 files changed, 9 insertions, 4 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index a3f6e126..21cf6503 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -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
'conceallevel' is set to 1.
*lcs-nbsp*
- nbsp:c Character to show for a non-breakable space (character
- 0xA0, 160). Left blank when omitted.
+ nbsp:c Character to show for a non-breakable space character
+ (0xA0 (160 decimal) and U+202F). Left blank when
+ omitted.
The characters ':' and ',' should not be used. UTF-8 characters can
be used when 'encoding' is "utf-8", otherwise only printable
diff --git a/src/message.c b/src/message.c
index b046ac95..2ab0a831 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1697,7 +1697,9 @@ msg_prt_line(s, list)
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;
diff --git a/src/screen.c b/src/screen.c
index e210ec8c..3f3123ad 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4338,7 +4338,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
if (wp->w_p_list
&& (((c == 160
#ifdef FEAT_MBYTE
- || (mb_utf8 && mb_c == 160)
+ || (mb_utf8 && (mb_c == 160 || mb_c == 0x202f))
#endif
) && lcs_nbsp)
|| (c == ' ' && lcs_space && ptr - line <= trailcol)))
diff --git a/src/version.c b/src/version.c
index 1be01349..694d8443 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 */
/**/
+ 722,
+/**/
721,
/**/
720,