patch 8.1.0797: error E898 is used twice

Problem:    Error E898 is used twice.
Solution:   Rename the Blob error to E899. (closes #3853)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 325676dbd40d18bfea0f5eacb2796998101d724f..3db9151c65c4366a2635b408d519669f8f2d5596 100644 (file)
--- 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 11884abe7f1e9e7304feda6292d61ee90cd2307c..e0f5d6e7311317bd9ac18cada1ed86e28ab7ac06 100644 (file)
--- 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 6c90cbc1b356602818cb05d663633773d1538f11..1af47d9f7e3e380f908bfa3970b7dc7042e8fa4a 100644 (file)
--- 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 a4decba70ee26b7b37a3bca6ac7db89ef891e34c..e22ebcb375d1ade948afc36ec5b7279712ae3a99 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -791,6 +791,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    797,
 /**/
     796,
 /**/