summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-06-23 15:09:10 +0200
committerBram Moolenaar <Bram@vim.org>2018-06-23 15:09:10 +0200
commit1f8c469fe22adf7b42843c3abf118ed339e6da0e (patch)
treed0e31c12b251fb37b81465d405ca9fa6205a673c
parent81612b7a7dc50a6c0da9f42fa48f1f576a4ad616 (diff)
downloadvim-1f8c469fe22adf7b42843c3abf118ed339e6da0e.zip
patch 8.1.0102: cannot build without syntax highlighting
Problem: Cannot build without syntax highlighting. Solution: Add #ifdef around using reg_do_extmatch.
-rw-r--r--src/regexp.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/regexp.c b/src/regexp.c
index 9ac712eeb..7344928ff 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -8376,11 +8376,15 @@ vim_regexec_multi(
#ifdef FEAT_EVAL
report_re_switch(pat);
#endif
+#ifdef FEAT_SYN_HL
// checking for \z misuse was already done when compiling for NFA,
// allow all here
reg_do_extmatch = REX_ALL;
+#endif
rmp->regprog = vim_regcomp(pat, re_flags);
+#ifdef FEAT_SYN_HL
reg_do_extmatch = 0;
+#endif
if (rmp->regprog != NULL)
result = rmp->regprog->engine->regexec_multi(
diff --git a/src/version.c b/src/version.c
index a2da37ed8..a38cdda3a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 102,
+/**/
101,
/**/
100,