summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-06-03 19:41:06 +0200
committerBram Moolenaar <bram@vim.org>2013-06-03 19:41:06 +0200
commitf603ce1d58158f2a1b955bd3b1168ffa2b4ec5e5 (patch)
tree39eed73c1ac6df5b373650b75953dee8570f656b
parent40c264312207012c847f850b7b327791ea47b341 (diff)
downloadvim-f603ce1d58158f2a1b955bd3b1168ffa2b4ec5e5.tar.gz
updated for version 7.3.1107v7.3.1107v7-3-1107
Problem: Compiler warnings for unused variables. Solution: Put the variables inside #ifdef.
-rw-r--r--src/regexp.c2
-rw-r--r--src/regexp_nfa.c4
-rw-r--r--src/version.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/src/regexp.c b/src/regexp.c
index 2804f806..369516ae 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -361,8 +361,10 @@ static char_u e_missingbracket[] = N_("E769: Missing ] after %s[");
static char_u e_unmatchedpp[] = N_("E53: Unmatched %s%%(");
static char_u e_unmatchedp[] = N_("E54: Unmatched %s(");
static char_u e_unmatchedpar[] = N_("E55: Unmatched %s)");
+#ifdef FEAT_SYN_HL
static char_u e_z_not_allowed[] = N_("E66: \\z( not allowed here");
static char_u e_z1_not_allowed[] = N_("E67: \\z1 et al. not allowed here");
+#endif
#define NOT_MULTI 0
#define MULTI_ONE 1
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 1bb82fdd..75cbb2ae 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -237,8 +237,10 @@ static int nfa_has_zend;
/* NFA regexp \1 .. \9 encountered. */
static int nfa_has_backref;
+#ifdef FEAT_SYN_HL
/* NFA regexp has \z( ), set zsubexpr. */
static int nfa_has_zsubexpr;
+#endif
/* Number of sub expressions actually being used during execution. 1 if only
* the whole match (subexpr 0) is used. */
@@ -420,7 +422,7 @@ nfa_recognize_char_class(start, end, extra_newl)
if (*p == '^')
{
not = TRUE;
- p ++;
+ p++;
}
while (p < end)
diff --git a/src/version.c b/src/version.c
index 7787b892..d9a3a88e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1107,
+/**/
1106,
/**/
1105,