summaryrefslogtreecommitdiff
path: root/src/version.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-24 16:49:11 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-24 16:49:11 +0100
commitfcaaae6b3fdbf3421a1ff95a25ae16d82381c39a (patch)
tree897597dbdd77dc91e87b5831a4b5e111adfc75ae /src/version.c
parent938ee834d345062cd94f8fdfd54fad0019432a83 (diff)
downloadvim-git-fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a.tar.gz
patch 7.4.1166v7.4.1166
Problem: Can't encode a Funcref into JSON. jsonencode() doesn't handle the same list or dict twice properly. (Nikolay Pavlov) Solution: Give an error. Reset copyID when the list or dict is finished.
Diffstat (limited to 'src/version.c')
-rw-r--r--src/version.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/version.c b/src/version.c
index 27496b9f3..936fe0aa9 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 */
/**/
+ 1166,
+/**/
1165,
/**/
1164,