Mercurial > vim

changeset 17174:23609a6d8cc7 v8.1.1586

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <Bram@vim.org>
date Mon, 24 Jun 2019 05:15:05 +0200
parents b18f5ff85acd
children e254d1329e65
files runtime/doc/popup.txt src/popupwin.c src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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;
 	}
     }
--- 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,