commit b2cda0dd1d9c9e47e21c59b8d40845210ab83f69
author Bram Moolenaar <Bram@vim.org> Mon Jun 24 05:06:36 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Jun 24 05:06:36 2019 +0200
tree a9c714dcf9e9ea291d7b1a686aeda4299301b46f
parent e7eb92708ec2092a2fc11e78703b5dcf83844412

patch 8.1.1586: error number used in two places

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

src/popupwin.c

diff --git a/src/popupwin.c b/src/popupwin.c
index f6da71d..16ec1a2 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -892,7 +892,7 @@
 	tp = find_tabpage(tabnr);
 	if (tp == NULL)
 	{
-	    semsg(_("E996: Tabpage not found: %d"), tabnr);
+	    semsg(_("E997: Tabpage not found: %d"), tabnr);
 	    return NULL;
 	}
     }

src/version.c

diff --git a/src/version.c b/src/version.c
index 58bfc1e..9d2f26c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1586,
+/**/
     1585,
 /**/
     1584,