# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1454437809 -3600
# Node ID d14cf20b44dca2796e2d2f078d8fa9fdc10cb337
# Parent  a84db977663ccb5881b406f198e73a14d3cc0b4f
commit https://github.com/vim/vim/commit/8d8c509ac8dea59ad07712971d74afae08521f79
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Feb 2 19:15:38 2016 +0100

    patch 7.4.1242
    Problem:    json_test fails without the eval feature.
    Solution:   Add #ifdef.

diff --git a/src/json_test.c b/src/json_test.c
--- a/src/json_test.c
+++ b/src/json_test.c
@@ -21,6 +21,7 @@
 /* This file has to be included because the tested functions are static */
 #include "json.c"
 
+#if defined(FEAT_EVAL)
 /*
  * Test json_find_end() with imcomplete items.
  */
@@ -182,12 +183,15 @@ test_fill_called_on_string(void)
     reader.js_cookie =        " \"foobar\"  ";
     assert(json_decode_string(&reader, NULL) == OK);
 }
+#endif
 
     int
 main(void)
 {
+#if defined(FEAT_EVAL)
     test_decode_find_end();
     test_fill_called_on_find_end();
     test_fill_called_on_string();
+#endif
     return 0;
 }
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1242,
+/**/
     1241,
 /**/
     1240,