# HG changeset patch # User Christian Brabandt # Date 1454018404 -3600 # Node ID 6f81cf49da14e6cdb4199138d6be7023270077d2 # Parent ca19726d5e83c7565af7291d00806adf80924717 commit https://github.com/vim/vim/commit/fa06a517b5d5e37f40ab7c884bd334f089988fac Author: Bram Moolenaar Date: Thu Jan 28 22:46:58 2016 +0100 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 --- 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 --- 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,