thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.973

Browse Source 
Problem:    Compiler warnings. Crash on startup. (Tony Mechelynck)
Solution:   Change EMSG2 to EMSGN. Make array one character longer.
This commit is contained in:
Bram Moolenaar
2013-05-19 22:31:18 +02:00
parent 097c992c46
commit ba40447ab1
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/regexp_nfa.c
View File

@@ -273,7 +273,7 @@ nfa_recognize_char_class(start, end, extra_newl)
NFA_HEAD, NFA_NHEAD, NFA_ALPHA, NFA_NALPHA, NFA_HEAD, NFA_NHEAD, NFA_ALPHA, NFA_NALPHA,
NFA_LOWER, NFA_NLOWER, NFA_UPPER, NFA_NUPPER NFA_LOWER, NFA_NLOWER, NFA_UPPER, NFA_NUPPER
}; };
char_u myconfig[9]; char_u myconfig[10];
char_u config[NCONFIGS][9] = { char_u config[NCONFIGS][9] = {
"000000100", /* digit */ "000000100", /* digit */
"100000100", /* non digit */ "100000100", /* non digit */
@@ -400,7 +400,7 @@ nfa_recognize_char_class(start, end, extra_newl)
} }
/* try to recognize character classes */ /* try to recognize character classes */
for (i = 0; i < NCONFIGS; i++) 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; return classid[i] + extra_newl;
/* fallthrough => no success so far */ /* fallthrough => no success so far */
@@ -759,7 +759,7 @@ nfa_regatom()
case Magic('&'): case Magic('&'):
case Magic(')'): case Magic(')'):
syntax_error = TRUE; syntax_error = TRUE;
EMSG2(_(e_misplaced), no_Magic(c)); EMSGN(_(e_misplaced), no_Magic(c));
return FAIL; return FAIL;
case Magic('='): case Magic('='):
@@ -770,7 +770,7 @@ nfa_regatom()
case Magic('{'): case Magic('{'):
/* these should follow an atom, not form an atom */ /* these should follow an atom, not form an atom */
syntax_error = TRUE; syntax_error = TRUE;
EMSG2(_(e_misplaced), no_Magic(c)); EMSGN(_(e_misplaced), no_Magic(c));
return FAIL; return FAIL;
case Magic('~'): /* previous substitute pattern */ case Magic('~'): /* previous substitute pattern */
@@ -816,7 +816,7 @@ nfa_regatom()
return FAIL; return FAIL;
default: default:
syntax_error = TRUE; syntax_error = TRUE;
EMSG2(_("E867: (NFA) Unknown operator '\\z%c'"), EMSGN(_("E867: (NFA) Unknown operator '\\z%c'"),
no_Magic(c)); no_Magic(c));
return FAIL; return FAIL;
} }
@@ -1363,7 +1363,7 @@ nfa_regpiece()
return FAIL; return FAIL;
default: default:
syntax_error = TRUE; syntax_error = TRUE;
EMSG2(_("E869: (NFA) Unknown operator '\\@%c'"), op); EMSGN(_("E869: (NFA) Unknown operator '\\@%c'"), op);
return FAIL; return FAIL;
} }
break; break;

2
src/version.c
View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
973,
/**/ /**/
972, 972,
/**/ /**/