# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1453586406 -3600
# Node ID 87f3f9536ecfb10300c1a717febfa448b8112ad5
# Parent  32d20fb991d50070aac5a90cc2685b274ad8876d
commit https://github.com/vim/vim/commit/bd4593ffb170230504500ddedabad3fad1f31291
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Jan 23 22:51:07 2016 +0100

    patch 7.4.1160
    Problem:    No error for jsondecode('"').
    Solution:   Give an error message for missing double quote.

diff --git a/src/json.c b/src/json.c
--- a/src/json.c
+++ b/src/json.c
@@ -406,6 +406,7 @@ json_decode_string(js_read_T *reader, ty
     }
     else
     {
+	EMSG(_(e_invarg));
 	res->v_type = VAR_SPECIAL;
 	res->vval.v_number = VVAL_NONE;
     }
diff --git a/src/version.c b/src/version.c
--- 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 */
 /**/
+    1160,
+/**/
     1159,
 /**/
     1158,