summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_vim9_builtin.vim7
-rw-r--r--src/version.c2
-rw-r--r--src/vim9execute.c1
3 files changed, 10 insertions, 0 deletions
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index 24a7f9583..01f29d9d2 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -371,10 +371,17 @@ def Test_bufname()
assert_fails('bufname([])', 'E1220:')
enddef
+let s:bufnr_res = 0
+
def Test_bufnr()
var buf = bufnr()
bufnr('%')->assert_equal(buf)
+ # check the lock is not taken over through the stack
+ const nr = 10
+ bufnr_res = bufnr()
+ bufnr_res = 12345
+
buf = bufnr('Xdummy', true)
buf->assert_notequal(-1)
exe 'bwipe! ' .. buf
diff --git a/src/version.c b/src/version.c
index 9d3afeb16..fe7f299cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4643,
+/**/
4642,
/**/
4641,
diff --git a/src/vim9execute.c b/src/vim9execute.c
index a95a48806..c5dc30da0 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -937,6 +937,7 @@ call_prepare(int argcount, typval_T *argvars, ectx_T *ectx)
tv = STACK_TV_BOT(-1);
tv->v_type = VAR_NUMBER;
tv->vval.v_number = 0;
+ tv->v_lock = 0;
return OK;
}