diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-07 18:53:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-07 18:53:21 +0200 |
| commit | e83cca291112ea66f49079975e102ee36a47a24e (patch) | |
| tree | 313fb36ab531a6f2b5c981f920c09aa31212165c | |
| parent | 44d6652d561d628d12e3ff7f6636ea7d1f805ced (diff) | |
| download | vim-git-e83cca291112ea66f49079975e102ee36a47a24e.tar.gz | |
patch 8.2.1633: some error messages are internal but do not use iemsg()v8.2.1633
Problem: Some error messages are internal but do not use iemsg().
Solution: Use iemsg(). (Dominique Pellé, closes #6894)
| -rw-r--r-- | src/regexp.c | 2 | ||||
| -rw-r--r-- | src/regexp_bt.c | 10 | ||||
| -rw-r--r-- | src/regexp_nfa.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/regexp.c b/src/regexp.c index 22b2d17a3..f7f04ea87 100644 --- a/src/regexp.c +++ b/src/regexp.c @@ -2279,7 +2279,7 @@ vim_regsub_both( else if (*s == NUL) // we hit NUL. { if (copy) - emsg(_(e_re_damg)); + iemsg(_(e_re_damg)); goto exit; } else diff --git a/src/regexp_bt.c b/src/regexp_bt.c index d19515add..03b07a167 100644 --- a/src/regexp_bt.c +++ b/src/regexp_bt.c @@ -2293,7 +2293,7 @@ bt_regcomp(char_u *expr, int re_flags) int flags; if (expr == NULL) - EMSG_RET_NULL(_(e_null)); + IEMSG_RET_NULL(_(e_null)); init_class_tab(); @@ -2917,7 +2917,7 @@ do_class: break; default: // Oh dear. Called inappropriately. - emsg(_(e_re_corr)); + iemsg(_(e_re_corr)); #ifdef DEBUG printf("Called regrepeat with op code %d\n", OP(p)); #endif @@ -4099,7 +4099,7 @@ regmatch( break; default: - emsg(_(e_re_corr)); + iemsg(_(e_re_corr)); #ifdef DEBUG printf("Illegal op code %d\n", op); #endif @@ -4499,7 +4499,7 @@ 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 DEBUG printf("Premature EOL\n"); #endif @@ -4649,7 +4649,7 @@ bt_regexec_both( // Be paranoid... if (prog == NULL || line == NULL) { - emsg(_(e_null)); + iemsg(_(e_null)); goto theend; } diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 444b446ca..c75c575fd 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -7147,7 +7147,7 @@ nfa_regexec_both( // Be paranoid... if (prog == NULL || line == NULL) { - emsg(_(e_null)); + iemsg(_(e_null)); goto theend; } diff --git a/src/version.c b/src/version.c index 2a13bf3dd..1b91560bb 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1633, +/**/ 1632, /**/ 1631, |