changeset 15579:391ac26c9412 v8.1.0797

patch 8.1.0797: error E898 is used twice commit https://github.com/vim/vim/commit/bf821bccf18453b01d25bee53e4954b02a5dd0e6 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jan 23 21:15:02 2019 +0100 patch 8.1.0797: error E898 is used twice Problem: Error E898 is used twice. Solution: Rename the Blob error to E899. (closes https://github.com/vim/vim/issues/3853)
author Bram Moolenaar <Bram@vim.org>
date Wed, 23 Jan 2019 21:30:08 +0100
parents 85190e2fcf05
children 0bf6ce525d42
files runtime/doc/eval.txt src/evalfunc.c src/testdir/test_listdict.vim src/version.c
diffstat 4 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -38,7 +38,7 @@ 13. Testing			|testing|
 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*
--- 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
--- 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
--- 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,