Mercurial > vim
changeset 4450:09e1e574a52d v7.3.973
updated for version 7.3.973
Problem: Compiler warnings. Crash on startup. (Tony Mechelynck)
Solution: Change EMSG2 to EMSGN. Make array one character longer.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 19 May 2013 22:31:18 +0200 |
| parents | 60d7eecf859b |
| children | 0917206e7317 |
| files | src/regexp_nfa.c src/version.c |
| diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -273,7 +273,7 @@ nfa_recognize_char_class(start, end, ext 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 @@ nfa_recognize_char_class(start, end, ext } /* 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 @@ nfa_regatom() 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 @@ nfa_regatom() 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 @@ nfa_regatom() 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 @@ nfa_regpiece() return FAIL; default: syntax_error = TRUE; - EMSG2(_("E869: (NFA) Unknown operator '\\@%c'"), op); + EMSGN(_("E869: (NFA) Unknown operator '\\@%c'"), op); return FAIL; } break;