diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-09-07 18:06:53 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-09-07 18:42:15 -0400 |
| commit | 951ef21de5ccca187cb9eaad7d7e5f3bad0c5966 (patch) | |
| tree | e1dcb93a85bd6821f745ce5305f2fc6d9402c20e /src/nvim/regexp.c | |
| parent | d8e6a0396a1bdc19c9e15adb233540816274487d (diff) | |
| download | rneovim-951ef21de5ccca187cb9eaad7d7e5f3bad0c5966.tar.gz rneovim-951ef21de5ccca187cb9eaad7d7e5f3bad0c5966.tar.bz2 rneovim-951ef21de5ccca187cb9eaad7d7e5f3bad0c5966.zip | |
vim-patch:8.2.1633: some error messages are internal but do not use iemsg()
Problem: Some error messages are internal but do not use iemsg().
Solution: Use iemsg(). (Dominique Pellé, closes vim/vim#6894)
https://github.com/vim/vim/commit/e83cca291112ea66f49079975e102ee36a47a24e
N/A patches for version.c:
vim-patch:8.2.1625: compiler warning for use of fptr_T
Problem: Compiler warning for use of fptr_T.
Solution: Make the type less strict.
https://github.com/vim/vim/commit/30d6413782c8206899cee109f521895a03c76441
vim-patch:8.2.1630: terminal test fails
Problem: Terminal test fails.
Solution: Correct argument to term_start(). Correct error number.
https://github.com/vim/vim/commit/c98cdb3bc970f04f93b4c394b4ec94c2eb5546c3
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 { |