patch 7.4.722

Problem:    0x202f is not recognized as a non-breaking space character.
Solution:   Add 0x202f to the list. (Christian Brabandt)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index a3f6e126525308222383408d41626886c1d46e96..21cf6503f9340323f50950f446d969402ddbe613 100644 (file)
--- 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 b046ac95e121d2f371bc748bfdfe3e253d2f11af..2ab0a831d3abea98b14883c813ee0b59e21ef8b8 100644 (file)
--- 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 e210ec8c9635c48c6b85990128dec1956218613d..3f3123adbd7c2d713ec996fd93d63b2f58487954 100644 (file)
--- 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 1be013492cd366b7d8e0e3e8c3e8729b61cfd150..694d844311493cdaed15303ac61f29ff1281790f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    722,
 /**/
     721,
 /**/