patch 7.4.1192

Problem:    Can't build with FEAT_EVAL but without FEAT_MBYTE. (John
            Marriott)
Solution:   Add #ifdef for FEAT_MBYTE.

diff --git a/src/json.c b/src/json.c
index d6507c3517520ff35710cbc67d43e86b526ad650..7256a8ceda9ed0a19a75e55b388f711def164c5c 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -68,7 +68,12 @@ write_string(garray_T *gap, char_u *str)
                default:
                    if (c >= 0x20)
                    {
+#ifdef FEAT_MBYTE
                        numbuf[mb_char2bytes(c, numbuf)] = NUL;
+#else
+                       numbuf[0] = c;
+                       numbuf[1] = NUL;
+#endif
                        ga_concat(gap, numbuf);
                    }
                    else

diff --git a/src/version.c b/src/version.c
index e464a4252dbcb395e8e3ee99b88b0e475cb85509..d9b9ebab993f9a521f499b6cc65aa67ca22cf74a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1192,
 /**/
     1191,
 /**/