mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7804 from jamessan/vim-8.0.0160

Browse Source 
[RFC] vim-patch:8.0.0160
This commit is contained in:
James McCoy
2018-01-03 07:22:35 -05:00
committed by GitHub
parent 09b9f9b7ce 5f5011e8f6
commit d2bc610d64
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/if_cscope.c
View File

@@ -1369,8 +1369,8 @@ static char *cs_manage_matches(char **matches, char **contexts,
case Print: case Print:
cs_print_tags_priv(mp, cp, cnt); cs_print_tags_priv(mp, cp, cnt);
break; break;
default: /* should not reach here */ default: // should not reach here
(void)EMSG(_("E570: fatal error in cs_manage_matches")); IEMSG(_("E570: fatal error in cs_manage_matches"));
return NULL; return NULL;
} }

24
src/nvim/regexp_nfa.c
View File

@@ -1263,7 +1263,7 @@ static int nfa_regatom(void)
rc_did_emsg = TRUE; rc_did_emsg = TRUE;
return FAIL; return FAIL;
} }
EMSGN("INTERNAL: Unknown character class char: %" PRId64, c); IEMSGN("INTERNAL: Unknown character class char: %" PRId64, c);
return FAIL; return FAIL;
} }
/* When '.' is followed by a composing char ignore the dot, so that /* When '.' is followed by a composing char ignore the dot, so that
@@ -4413,8 +4413,8 @@ static int check_char_class(int class, int c)
break; break;
default: default:
/* should not be here :P */ // should not be here :P
EMSGN(_(e_ill_char_class), class); IEMSGN(_(e_ill_char_class), class);
return FAIL; return FAIL;
} }
return FAIL; return FAIL;
@@ -5992,8 +5992,9 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
int c = t->state->c; int c = t->state->c;
#ifdef REGEXP_DEBUG #ifdef REGEXP_DEBUG
if (c < 0) if (c < 0) {
EMSGN("INTERNAL: Negative state char: %" PRId64, c); IEMSGN("INTERNAL: Negative state char: %" PRId64, c);
}
#endif #endif
result = (c == curc); result = (c == curc);
@@ -6462,12 +6463,13 @@ static regprog_T *nfa_regcomp(char_u *expr, int re_flags)
* (and count its size). */ * (and count its size). */
postfix = re2post(); postfix = re2post();
if (postfix == NULL) { if (postfix == NULL) {
/* TODO: only give this error for debugging? */ // TODO(vim): only give this error for debugging?
if (post_ptr >= post_end) if (post_ptr >= post_end) {
EMSGN("Internal error: estimated max number " IEMSGN("Internal error: estimated max number "
"of states insufficient: %" PRId64, "of states insufficient: %" PRId64,
post_end - post_start); post_end - post_start);
goto fail; /* Cascaded (syntax?) error */ }
goto fail; // Cascaded (syntax?) error
} }
/* /*