summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-01-26 21:32:59 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-26 21:32:59 +0000
commite939f5ebbae8dd7825d62d84e0c9910fa1756a9c (patch)
tree1539cff07da8b588993840da4d455ddf9135e1a1
parentfc4c44836acf7cd83af6d9b5b4737a305c5b3fb2 (diff)
downloadvim-git-e939f5ebbae8dd7825d62d84e0c9910fa1756a9c.tar.gz
patch 8.2.4227: Vim9: using "lockvar!" in :def function does not workv8.2.4227
Problem: Vim9: using "lockvar!" in :def function does not work. Solution: Add "!" instead of "-1". (closes #9634)
-rw-r--r--src/testdir/test_vim9_cmd.vim11
-rw-r--r--src/version.c2
-rw-r--r--src/vim9cmds.c10
3 files changed, 19 insertions, 4 deletions
diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index 7b2edfd1b..cfbac9aaf 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -1425,6 +1425,17 @@ def Test_lockvar()
assert_equal([0, 1, 2], g:therange)
unlet g:therange
+ # use exclamation mark for locking deeper
+ g:nestedlist = [1, [2, 3], 4]
+ lockvar! g:nestedlist
+ try
+ g:nestedlist[1][0] = 9
+ catch /E1119:/
+ caught = true
+ endtry
+ assert_true(caught)
+ unlet g:nestedlist
+
var d = {a: 1, b: 2}
d.a = 3
d.b = 4
diff --git a/src/version.c b/src/version.c
index 576c06c25..e77826c07 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 */
/**/
+ 4227,
+/**/
4226,
/**/
4225,
diff --git a/src/vim9cmds.c b/src/vim9cmds.c
index 1af2a157e..716a40411 100644
--- a/src/vim9cmds.c
+++ b/src/vim9cmds.c
@@ -223,10 +223,12 @@ compile_lock_unlock(
ret = FAIL;
else
{
- vim_snprintf((char *)buf, len, "%s %d %s",
- eap->cmdidx == CMD_lockvar ? "lockvar" : "unlockvar",
- deep,
- p);
+ char *cmd = eap->cmdidx == CMD_lockvar ? "lockvar" : "unlockvar";
+
+ if (deep < 0)
+ vim_snprintf((char *)buf, len, "%s! %s", cmd, p);
+ else
+ vim_snprintf((char *)buf, len, "%s %d %s", cmd, deep, p);
ret = generate_EXEC_copy(cctx, isn, buf);
vim_free(buf);