diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-23 21:15:02 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-23 21:15:02 +0100 |
| commit | bf821bccf18453b01d25bee53e4954b02a5dd0e6 (patch) | |
| tree | c105e92a32e35e80fe994631a397b3e2bcf072fc | |
| parent | 31faed60bfd54ff8f612f6b311a6cbcd9e7ebedd (diff) | |
patch 8.1.0797: error E898 is used twicev8.1.0797
Problem: Error E898 is used twice.
Solution: Rename the Blob error to E899. (closes #3853)
| -rw-r--r-- | runtime/doc/eval.txt | 2 | ||||
| -rw-r--r-- | src/evalfunc.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_listdict.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 325676dbd4..3db9151c65 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -38,7 +38,7 @@ done, the features in this document are not available. See |+eval| and 1. Variables *variables* 1.1 Variable types ~ - *E712* *E896* *E897* *E898* + *E712* *E896* *E897* *E899* There are nine types of variables: Number A 32 or 64 bit signed number. |expr-number| *Number* diff --git a/src/evalfunc.c b/src/evalfunc.c index 11884abe7f..e0f5d6e731 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -29,7 +29,7 @@ #endif static char *e_listarg = N_("E686: Argument of %s must be a List"); -static char *e_listblobarg = N_("E898: Argument of %s must be a List or Blob"); +static char *e_listblobarg = N_("E899: Argument of %s must be a List or Blob"); static char *e_stringreq = N_("E928: String required"); #ifdef FEAT_FLOAT diff --git a/src/testdir/test_listdict.vim b/src/testdir/test_listdict.vim index 6c90cbc1b3..1af47d9f7e 100644 --- a/src/testdir/test_listdict.vim +++ b/src/testdir/test_listdict.vim @@ -597,7 +597,7 @@ func Test_reverse_sort_uniq() call assert_equal(['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l), 'i')) call assert_equal(['BAR', 'Bar', 'FOO', 'FOOBAR', 'Foo', 'bar', 'foo', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l))) - call assert_fails('call reverse("")', 'E898:') + call assert_fails('call reverse("")', 'E899:') endfunc " splitting a string to a List diff --git a/src/version.c b/src/version.c index a4decba70e..e22ebcb375 100644 --- a/src/version.c +++ b/src/version.c @@ -792,6 +792,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 797, +/**/ 796, /**/ 795, |