From 6a950581da52b410a74531044aae8f1f8f38a7df Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 28 Aug 2020 16:39:33 +0200 Subject: [PATCH] patch 8.2.1533: Vim9: error when passing getreginfo() result to setreg() Problem: Vim9: error when passing getreginfo() result to setreg(). Solution: Use dict_get_bool() for "isunnamed". (closes #6784) --- src/evalfunc.c | 2 +- src/testdir/test_vim9_func.vim | 7 +++++++ src/version.c | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/evalfunc.c b/src/evalfunc.c index fcfd4b10d..270dcd2cd 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -7427,7 +7427,7 @@ f_setreg(typval_T *argvars, typval_T *rettv) regname = pointreg; } } - else if (dict_get_number(d, (char_u *)"isunnamed")) + else if (dict_get_bool(d, (char_u *)"isunnamed", -1) > 0) pointreg = regname; } else diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 412e4a6dc..2c23a0e16 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1419,6 +1419,13 @@ def Test_setbufvar() setlocal ts=8 enddef +def Test_setreg() + setreg('a', ['aaa', 'bbb', 'ccc']) + let reginfo = getreginfo('a') + setreg('a', reginfo) + assert_equal(reginfo, getreginfo('a')) +enddef + def Fibonacci(n: number): number if n < 2 return n diff --git a/src/version.c b/src/version.c index ba62765bc..e6299f413 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1533, /**/ 1532, /**/ -- 2.40.0