summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-01-06 21:41:11 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-06 21:41:11 +0000
commit11de43d2d476c449587f1f0712924890ab677708 (patch)
treee33dfc2f5ff7296126fe75a8f02180b896375c47
parent2ef01d929d094c9063a259a74e23cf61be74b9b6 (diff)
downloadvim-git-11de43d2d476c449587f1f0712924890ab677708.tar.gz
patch 8.2.4022: two error messages in the wrong filev8.2.4022
Problem: Two error messages in the wrong file. Solution: Use the error message from errors.h.
-rw-r--r--src/popupwin.c6
-rw-r--r--src/usercmd.c2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/src/popupwin.c b/src/popupwin.c
index 07022221e..ec7623d0f 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -1917,7 +1917,7 @@ popup_create(typval_T *argvars, typval_T *rettv, create_type_T type)
tp = find_tabpage(tabnr);
if (tp == NULL)
{
- semsg(_("E997: Tabpage not found: %d"), tabnr);
+ semsg(_(e_tabpage_not_found_nr), tabnr);
return NULL;
}
}
@@ -2525,7 +2525,7 @@ find_popup_win(int id)
if (wp != NULL && !WIN_IS_POPUP(wp))
{
- semsg(_("E993: window %d is not a popup window"), id);
+ semsg(_(e_window_nr_is_not_popup_window), id);
return NULL;
}
return wp;
@@ -2671,7 +2671,7 @@ popup_free(win_T *wp)
static void
error_for_popup_window(void)
{
- emsg(_("E994: Not allowed in a popup window"));
+ emsg(_(e_not_allowed_in_popup_window));
}
int
diff --git a/src/usercmd.c b/src/usercmd.c
index d4ed0a46a..135752d11 100644
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -618,7 +618,7 @@ parse_addr_type_arg(
for (i = 0; err[i] != NUL && !VIM_ISWHITE(err[i]); i++)
;
err[i] = NUL;
- semsg(_("E180: Invalid address type value: %s"), err);
+ semsg(_(e_invalid_address_type_value_str), err);
return FAIL;
}
diff --git a/src/version.c b/src/version.c
index 4a72d01b6..68c194b51 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4022,
+/**/
4021,
/**/
4020,