diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2020-09-07 17:03:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 17:03:19 -0700 |
| commit | a90cd6e36a934280100bb3f28a32e5cbd7c5acf2 (patch) | |
| tree | e1dcb93a85bd6821f745ce5305f2fc6d9402c20e /src/nvim/regexp.c | |
| parent | d8e6a0396a1bdc19c9e15adb233540816274487d (diff) | |
| parent | 951ef21de5ccca187cb9eaad7d7e5f3bad0c5966 (diff) | |
| download | rneovim-a90cd6e36a934280100bb3f28a32e5cbd7c5acf2.tar.gz rneovim-a90cd6e36a934280100bb3f28a32e5cbd7c5acf2.tar.bz2 rneovim-a90cd6e36a934280100bb3f28a32e5cbd7c5acf2.zip | |
Merge #12868 vim-patch:8.2.{1625,1630,1633}
Diffstat (limited to 'src/nvim/regexp.c')
| -rw-r--r-- | src/nvim/regexp.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 9705896e9b..bcf02af4ef 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -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 { |