updated for version 7.3.973
Problem: Compiler warnings. Crash on startup. (Tony Mechelynck)
Solution: Change EMSG2 to EMSGN. Make array one character longer.
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 51e355a..92292e5 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -273,7 +273,7 @@
NFA_HEAD, NFA_NHEAD, NFA_ALPHA, NFA_NALPHA,
NFA_LOWER, NFA_NLOWER, NFA_UPPER, NFA_NUPPER
};
- char_u myconfig[9];
+ char_u myconfig[10];
char_u config[NCONFIGS][9] = {
"000000100", /* digit */
"100000100", /* non digit */
@@ -400,7 +400,7 @@
}
/* try to recognize character classes */
for (i = 0; i < NCONFIGS; i++)
- if (STRNCMP(myconfig, config[i],8) == 0)
+ if (STRNCMP(myconfig, config[i], 8) == 0)
return classid[i] + extra_newl;
/* fallthrough => no success so far */
@@ -759,7 +759,7 @@
case Magic('&'):
case Magic(')'):
syntax_error = TRUE;
- EMSG2(_(e_misplaced), no_Magic(c));
+ EMSGN(_(e_misplaced), no_Magic(c));
return FAIL;
case Magic('='):
@@ -770,7 +770,7 @@
case Magic('{'):
/* these should follow an atom, not form an atom */
syntax_error = TRUE;
- EMSG2(_(e_misplaced), no_Magic(c));
+ EMSGN(_(e_misplaced), no_Magic(c));
return FAIL;
case Magic('~'): /* previous substitute pattern */
@@ -816,7 +816,7 @@
return FAIL;
default:
syntax_error = TRUE;
- EMSG2(_("E867: (NFA) Unknown operator '\\z%c'"),
+ EMSGN(_("E867: (NFA) Unknown operator '\\z%c'"),
no_Magic(c));
return FAIL;
}
@@ -1363,7 +1363,7 @@
return FAIL;
default:
syntax_error = TRUE;
- EMSG2(_("E869: (NFA) Unknown operator '\\@%c'"), op);
+ EMSGN(_("E869: (NFA) Unknown operator '\\@%c'"), op);
return FAIL;
}
break;
diff --git a/src/version.c b/src/version.c
index 7cb6998..f9dd542 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 973,
+/**/
972,
/**/
971,