diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-28 22:46:58 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-28 22:46:58 +0100 |
| commit | fa06a517b5d5e37f40ab7c884bd334f089988fac (patch) | |
| tree | bb2ebd5961a55c2d39f684f23c13bbc8e9f7a125 | |
| parent | 298b440930ecece38d6ea0505a3e582dc817e79b (diff) | |
patch 7.4.1192v7.4.1192
Problem: Can't build with FEAT_EVAL but without FEAT_MBYTE. (John
Marriott)
Solution: Add #ifdef for FEAT_MBYTE.
| -rw-r--r-- | src/json.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/json.c b/src/json.c index d6507c3517..7256a8ceda 100644 --- 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 e464a4252d..d9b9ebab99 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1192, +/**/ 1191, /**/ 1190, |