patch 7.4.1444

Problem:    Can't build with JSON but without multi-byte.
Solution:   Fix pointer name.

diff --git a/src/json.c b/src/json.c
index 518a75a6889b6a26ca257192ca7876a69f1f0f86..bbc27b4401eadc71deb019bdc4a8645cedf72a35 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -101,7 +101,7 @@ write_string(garray_T *gap, char_u *str)
            /* always use utf-8 encoding, ignore 'encoding' */
            c = utf_ptr2char(res);
 #else
-           c = (int)*(p);
+           c = *res;
 #endif
 
            switch (c)
@@ -142,7 +142,7 @@ write_string(garray_T *gap, char_u *str)
 #ifdef FEAT_MBYTE
            res += utf_ptr2len(res);
 #else
-           ++p;
+           ++res;
 #endif
        }
        ga_append(gap, '"');

diff --git a/src/version.c b/src/version.c
index 26e88e4ff8f615ceea7d76013611cb78f9b4e850..8581c5c0d82802ed9caaf9537a78ad1cd79e0701 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1444,
 /**/
     1443,
 /**/