diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-27 22:59:41 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-27 22:59:41 +0100 |
| commit | 0f526f5652e0a5432493b3f2a1cb34ab99a9da0a (patch) | |
| tree | 66e9156a6f6d0ef1686a4766803004ef29cba1e3 | |
| parent | dae8d21dd291df6a6679a00be64e18bca0156576 (diff) | |
| download | vim-git-0f526f5652e0a5432493b3f2a1cb34ab99a9da0a.tar.gz | |
patch 7.4.1444v7.4.1444
Problem: Can't build with JSON but without multi-byte.
Solution: Fix pointer name.
| -rw-r--r-- | src/json.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/json.c b/src/json.c index 518a75a68..bbc27b440 100644 --- 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 26e88e4ff..8581c5c0d 100644 --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1444, +/**/ 1443, /**/ 1442, |