diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-02 21:45:54 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-02 21:45:54 +0200 |
| commit | 67ff97ded70a87bc77f58d0bf9a261710ae88112 (patch) | |
| tree | 0a9237798de8564603ae19c31d3d20d801d5b91b /src | |
| parent | 551d25e76545df785a9f62df52f34bc1dd368bfb (diff) | |
| download | vim-git-8.2.1573.tar.gz | |
patch 8.2.1573: Vim9: getreg() does not take "true" as argumentv8.2.1573
Problem: Vim9: getreg() does not take "true" as argument.
Solution: Use tv_get_bool_chk(). (closes #6820)
Diffstat (limited to 'src')
| -rw-r--r-- | src/evalfunc.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 69f781632..340ecf095 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -3336,9 +3336,9 @@ f_getreg(typval_T *argvars, typval_T *rettv) error = strregname == NULL; if (argvars[1].v_type != VAR_UNKNOWN) { - arg2 = (int)tv_get_number_chk(&argvars[1], &error); + arg2 = (int)tv_get_bool_chk(&argvars[1], &error); if (!error && argvars[2].v_type != VAR_UNKNOWN) - return_list = (int)tv_get_number_chk(&argvars[2], &error); + return_list = (int)tv_get_bool_chk(&argvars[2], &error); } } else diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index cf48ba866..8d8e0d48e 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1503,6 +1503,12 @@ def Test_expand() close enddef +def Test_getreg() + let lines = ['aaa', 'bbb', 'ccc'] + setreg('a', lines) + assert_equal(lines, getreg('a', true, true)) +enddef + def Test_recursive_call() assert_equal(6765, Fibonacci(20)) enddef diff --git a/src/version.c b/src/version.c index c674148ee..886cd4ef4 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1573, +/**/ 1572, /**/ 1571, |