diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-10-03 12:57:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-10-03 12:57:27 +0200 |
| commit | 016faaa1b2fe242022725b29e1353c42105d045c (patch) | |
| tree | 9093087726d1ebec32d45910fd719e115cfdb69d | |
| parent | 795aaa1e84d76a6fe066694de9876b8a21cbe40c (diff) | |
patch 8.2.1788: Vim9: still allows :let for declarationsv8.2.1788
Problem: Vim9: still allows :let for declarations.
Solution: Make the default for v:disallow_let one. It can still be set to
zero to allow for using :let.
| -rw-r--r-- | src/evalvars.c | 7 | ||||
| -rw-r--r-- | src/testdir/runtest.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index 319717ec89..fdc6f454a5 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -215,8 +215,8 @@ evalvars_init(void) // add to compat scope dict hash_add(&compat_hashtab, p->vv_di.di_key); } - vimvars[VV_VERSION].vv_nr = VIM_VERSION_100; - vimvars[VV_VERSIONLONG].vv_nr = VIM_VERSION_100 * 10000 + highest_patch(); + set_vim_var_nr(VV_VERSION, VIM_VERSION_100); + set_vim_var_nr(VV_VERSIONLONG, VIM_VERSION_100 * 10000 + highest_patch()); set_vim_var_nr(VV_SEARCHFORWARD, 1L); set_vim_var_nr(VV_HLSEARCH, 1L); @@ -244,6 +244,9 @@ evalvars_init(void) set_vim_var_nr(VV_ECHOSPACE, sc_col - 1); + // TODO: remove later + set_vim_var_nr(VV_DISALLOW_LET, 1); + // Default for v:register is not 0 but '"'. This is adjusted once the // clipboard has been setup by calling reset_reg_var(). set_reg_var(0); diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 08b1f8ec88..6b09b975de 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -360,9 +360,6 @@ func FinishTesting() qall! endfunc -" TODO: remove later -let v:disallow_let = 1 - " Source the test script. First grab the file name, in case the script " navigates away. g:testname can be used by the tests. let g:testname = expand('%') diff --git a/src/version.c b/src/version.c index 877d63de40..ff1a97a3d8 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 */ /**/ + 1788, +/**/ 1787, /**/ 1786, |