summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-02-03 22:58:48 +0100
committerBram Moolenaar <Bram@vim.org>2020-02-03 22:58:48 +0100
commita5edb670dcdeddc8520e012430fb256eb8470f6c (patch)
tree0c8720d384d3ac09c4e38a003e5c047876db8299
parent631ebc48149a0446dd9ffbddd3e2822252085885 (diff)
downloadvim-git-a5edb670dcdeddc8520e012430fb256eb8470f6c.tar.gz
patch 8.2.0205: error code E899 used twicev8.2.0205
Problem: Error code E899 used twice. Solution: Use E863 for the terminal in popup error.
-rw-r--r--src/popupwin.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/popupwin.c b/src/popupwin.c
index 714f457fe..c43800099 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2873,7 +2873,7 @@ error_if_term_popup_window()
if (WIN_IS_POPUP(curwin) && curbuf->b_term != NULL
&& term_job_running(curbuf->b_term))
{
- emsg(_("E899: Not allowed for a terminal in a popup window"));
+ emsg(_("E863: Not allowed for a terminal in a popup window"));
return TRUE;
}
return FALSE;
diff --git a/src/version.c b/src/version.c
index c3dbec81d..63461bd7c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 205,
+/**/
204,
/**/
203,