kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge #12868 vim-patch:8.2.{1625,1630,1633}

Browse Source
This commit is contained in:
Justin M. Keyes 2020-09-07 17:03:19 -07:00 committed by GitHub
commit a90cd6e36a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/regexp.c
View File

@ -1270,8 +1270,9 @@ static regprog_T *bt_regcomp(char_u *expr, int re_flags)
int len;
int flags;
if (expr == NULL)
EMSG_RET_NULL(_(e_null));
if (expr == NULL) {
IEMSG_RET_NULL(_(e_null));
}
init_class_tab();
@ -3483,7 +3484,7 @@ static long bt_regexec_both(char_u *line,
/* Be paranoid... */
if (prog == NULL || line == NULL) {
EMSG(_(e_null));
IEMSG(_(e_null));
goto theend;
}
@ -4789,7 +4790,7 @@ static bool regmatch(
break;
default:
EMSG(_(e_re_corr));
IEMSG(_(e_re_corr));
#ifdef REGEXP_DEBUG
printf("Illegal op code %d\n", op);
#endif
@ -5147,7 +5148,7 @@ static bool regmatch(
* We get here only if there's trouble -- normally "case END" is
* the terminating point.
*/
EMSG(_(e_re_corr));
IEMSG(_(e_re_corr));
#ifdef REGEXP_DEBUG
printf("Premature EOL\n");
#endif
@ -5552,8 +5553,8 @@ do_class:
}
break;
default: /* Oh dear. Called inappropriately. */
EMSG(_(e_re_corr));
default: // Oh dear. Called inappropriately.
IEMSG(_(e_re_corr));
#ifdef REGEXP_DEBUG
printf("Called regrepeat with op code %d\n", OP(p));
#endif
@ -6911,7 +6912,7 @@ static int vim_regsub_both(char_u *source, typval_T *expr, char_u *dest,
}
} else if (*s == NUL) { // we hit NUL.
if (copy) {
EMSG(_(e_re_damg));
IEMSG(_(e_re_damg));
}
goto exit;
} else {

2
src/nvim/regexp_nfa.c
View File

@ -6519,7 +6519,7 @@ static long nfa_regexec_both(char_u *line, colnr_T startcol,
/* Be paranoid... */
if (prog == NULL || line == NULL) {
EMSG(_(e_null));
IEMSG(_(e_null));
goto theend;
}