From 8d8c509ac8dea59ad07712971d74afae08521f79 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 2 Feb 2016 19:15:38 +0100
Subject: patch 7.4.1242 Problem:    json_test fails without the eval feature.
 Solution:   Add #ifdef.

---
 src/json_test.c | 4 ++++
 src/version.c   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/json_test.c b/src/json_test.c
index 041654392..f50c95608 100644
--- 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
index 39090d4fe..b252d9937 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1242,
 /**/
     1241,
 /**/
-- 
cgit v1.2.1