Mercurial > vim

changeset 7791:6f81cf49da14 v7.4.1192

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/fa06a517b5d5e37f40ab7c884bd334f089988fac Author: Bram Moolenaar <Bram@vim.org> 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.
author Christian Brabandt <cb@256bit.org>
date Thu, 28 Jan 2016 23:00:04 +0100
parents ca19726d5e83
children 05ab49635a50
files src/json.c src/version.c
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,