From: Bram Moolenaar Date: Thu, 28 Jan 2016 21:46:58 +0000 (+0100) Subject: patch 7.4.1192 X-Git-Tag: v7.4.1192 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa06a517b5d5e37f40ab7c884bd334f089988fac;p=thirdparty%2Fvim.git 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 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 @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1192, /**/ 1191, /**/