# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1561346105 -7200
# Node ID 23609a6d8cc7e57e4f69e5d65aaa5eefe6c2ccca
# Parent  b18f5ff85acdbfb07943c5eefb751c92075fa2f2
patch 8.1.1586: error number used in two places

commit https://github.com/vim/vim/commit/b2cda0dd1d9c9e47e21c59b8d40845210ab83f69
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Jun 24 05:06:36 2019 +0200

    patch 8.1.1586: error number used in two places

    Problem:    Error number used in two places.
    Solution:   Renumber one. (Ken Takata)

diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt
--- a/runtime/doc/popup.txt
+++ b/runtime/doc/popup.txt
@@ -483,7 +483,7 @@ The second argument of |popup_create()| 
 			tab page.
 			Otherwise the number of the tab page the popup is
 			displayed on; when invalid the popup is not created
-			and an error is given. *E996*
+			and an error is given. *E997*
 	title		Text to be displayed above the first item in the
 			popup, on top of any border.  If there is no top
 			border one line of padding is added to put the title
diff --git a/src/popupwin.c b/src/popupwin.c
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -892,7 +892,7 @@ popup_create(typval_T *argvars, typval_T
 	tp = find_tabpage(tabnr);
 	if (tp == NULL)
 	{
-	    semsg(_("E996: Tabpage not found: %d"), tabnr);
+	    semsg(_("E997: Tabpage not found: %d"), tabnr);
 	    return NULL;
 	}
     }
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1586,
+/**/
     1585,
 /**/
     1584,