# HG changeset patch # User Christian Brabandt # Date 1453575605 -3600 # Node ID c29a7e38b8ac887f5a45b38db52722e835734ec1 # Parent 1324d6282344aba74270fb33f2f3453ccca5a9bd commit https://github.com/vim/vim/commit/64922b9014765a41bb09e8612433a2a61918af6e Author: Bram Moolenaar Date: Sat Jan 23 19:54:30 2016 +0100 patch 7.4.1155 Problem: Build with normal features fails. Solution: Always deinfe dict_lookup(). diff --git a/src/eval.c b/src/eval.c --- a/src/eval.c +++ b/src/eval.c @@ -6140,8 +6140,6 @@ list_equal(l1, l2, ic, recursive) return item1 == NULL && item2 == NULL; } -#if defined(FEAT_RUBY) || defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) \ - || defined(FEAT_MZSCHEME) || defined(FEAT_LUA) || defined(PROTO) /* * Return the dictitem that an entry in a hashtable points to. */ @@ -6151,7 +6149,6 @@ dict_lookup(hi) { return HI2DI(hi); } -#endif /* * Return TRUE when two dictionaries have exactly the same key/values. 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 */ /**/ + 1155, +/**/ 1154, /**/ 1153,