diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-24 05:06:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-24 05:06:36 +0200 |
| commit | b2cda0dd1d9c9e47e21c59b8d40845210ab83f69 (patch) | |
| tree | a9c714dcf9e9ea291d7b1a686aeda4299301b46f | |
| parent | e7eb92708ec2092a2fc11e78703b5dcf83844412 (diff) | |
patch 8.1.1586: error number used in two placesv8.1.1586
Problem: Error number used in two places.
Solution: Renumber one. (Ken Takata)
| -rw-r--r-- | runtime/doc/popup.txt | 2 | ||||
| -rw-r--r-- | src/popupwin.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt index f39725717b..d04a6b44ec 100644 --- a/runtime/doc/popup.txt +++ b/runtime/doc/popup.txt @@ -483,7 +483,7 @@ The second argument of |popup_create()| is a dictionary with options: 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 index f6da71da82..16ec1a2830 100644 --- a/src/popupwin.c +++ b/src/popupwin.c @@ -892,7 +892,7 @@ popup_create(typval_T *argvars, typval_T *rettv, create_type_T type) 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 index 58bfc1e949..9d2f26cbb2 100644 --- 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, |