summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-09-06 21:32:11 +0200
committerBram Moolenaar <Bram@vim.org>2016-09-06 21:32:11 +0200
commit7947312871e7d01cdba058199904c212ec32f1c0 (patch)
tree48aee621ae7f7e063583be03904087c784c75747
parent77b642501ac4c84b4e6820d4e5636eb856faaea7 (diff)
downloadvim-git-7947312871e7d01cdba058199904c212ec32f1c0.tar.gz
patch 7.4.2338v7.4.2338
Problem: Can't build with small features. (John Marriott) Solution: Nearly always define FEAT_TAG_BINS.
-rw-r--r--src/feature.h2
-rw-r--r--src/tag.c2
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/src/feature.h b/src/feature.h
index 21114c242..138279e46 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -332,7 +332,7 @@
* sorted by character values. I'm not sure how to fix this. Should we really
* do a EBCDIC to ASCII conversion for this??
*/
-#if defined(FEAT_NORMAL) && !defined(EBCDIC)
+#if !defined(EBCDIC)
# define FEAT_TAG_BINS
#endif
diff --git a/src/tag.c b/src/tag.c
index 3f1dfa9f6..d679686a5 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1578,10 +1578,12 @@ find_tags(
*/
for (;;)
{
+#ifdef FEAT_TAG_BINS
/* check for CTRL-C typed, more often when jumping around */
if (state == TS_BINARY || state == TS_SKIP_BACK)
line_breakcheck();
else
+#endif
fast_breakcheck();
#ifdef FEAT_INS_EXPAND
if ((flags & TAG_INS_COMP)) /* Double brackets for gcc */
diff --git a/src/version.c b/src/version.c
index 3331ee358..79628cba7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2338,
+/**/
2337,
/**/
2336,