diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-07-19 10:38:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-07-19 10:38:49 +0200 |
| commit | 98c2eaed27579602e05e7b96aa3a60428a8b9cb2 (patch) | |
| tree | 4a22dcbc1ae2045a8fda93e57194062802652675 | |
| parent | 885971e2f5eabc4108e083086c1d6d0a31a2782f (diff) | |
| download | vim-git-98c2eaed27579602e05e7b96aa3a60428a8b9cb2.tar.gz | |
patch 8.2.3183: duplicate error numbersv8.2.3183
Problem: Duplicate error numbers.
Solution: Adjust the error numbers.
| -rw-r--r-- | src/errors.h | 4 | ||||
| -rw-r--r-- | src/testdir/test_vim9_builtin.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/errors.h b/src/errors.h index be1341adb..97e7a1259 100644 --- a/src/errors.h +++ b/src/errors.h @@ -505,6 +505,6 @@ EXTERN char e_number_required_for_argument_nr[] EXTERN char e_list_required_for_argument_nr[] INIT(= N_("E1211: List required for argument %d")); EXTERN char e_bool_required_for_argument_nr[] - INIT(= N_("E1211: Bool required for argument %d")); + INIT(= N_("E1212: Bool required for argument %d")); EXTERN char e_redefining_imported_item_str[] - INIT(= N_("E1212: Redefining imported item %s")); + INIT(= N_("E1213: Redefining imported item %s")); diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim index 76987b68a..e717163cc 100644 --- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -478,7 +478,7 @@ def Test_char2nr() assert_fails('char2nr(true)', 'E1174:') CheckDefAndScriptFailure2(['char2nr(10)'], 'E1013: Argument 1: type mismatch, expected string but got number', 'E1174: String required for argument 1') - CheckDefAndScriptFailure2(['char2nr("a", 2)'], 'E1013: Argument 2: type mismatch, expected bool but got number', 'E1211: Bool required for argument 2') + CheckDefAndScriptFailure2(['char2nr("a", 2)'], 'E1013: Argument 2: type mismatch, expected bool but got number', 'E1212: Bool required for argument 2') assert_equal(97, char2nr('a', 1)) assert_equal(97, char2nr('a', 0)) assert_equal(97, char2nr('a', true)) @@ -2534,7 +2534,7 @@ enddef def Test_str2list() CheckDefAndScriptFailure2(['str2list(10)'], 'E1013: Argument 1: type mismatch, expected string but got number', 'E1174: String required for argument 1') - CheckDefAndScriptFailure2(['str2list("a", 2)'], 'E1013: Argument 2: type mismatch, expected bool but got number', 'E1211: Bool required for argument 2') + CheckDefAndScriptFailure2(['str2list("a", 2)'], 'E1013: Argument 2: type mismatch, expected bool but got number', 'E1212: Bool required for argument 2') assert_equal([97], str2list('a')) assert_equal([97], str2list('a', 1)) assert_equal([97], str2list('a', true)) @@ -2560,7 +2560,7 @@ enddef def Test_strchars() strchars("A\u20dd", true)->assert_equal(1) CheckDefAndScriptFailure2(['strchars(10)'], 'E1013: Argument 1: type mismatch, expected string but got number', 'E1174: String required for argument 1') - CheckDefAndScriptFailure2(['strchars("a", 2)'], 'E1013: Argument 2: type mismatch, expected bool but got number', 'E1211: Bool required for argument 2') + CheckDefAndScriptFailure2(['strchars("a", 2)'], 'E1013: Argument 2: type mismatch, expected bool but got number', 'E1212: Bool required for argument 2') assert_equal(3, strchars('abc')) assert_equal(3, strchars('abc', 1)) assert_equal(3, strchars('abc', true)) diff --git a/src/version.c b/src/version.c index 6ae1d3bf0..a1f79b6ba 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3183, +/**/ 3182, /**/ 3181, |