aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.1882: Vim9: v:disallow_let is no longer needed

Browse Source 
Problem:    Vim9: v:disallow_let is no longer needed.
Solution:   Remove v:disallow_let.
This commit is contained in:
Bram Moolenaar
2020-10-21 20:58:52 +02:00
parent 692d1a51e7
commit c58f5456e5
4 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/evalvars.c
View File

@@ -146,7 +146,6 @@ static struct vimvar
{VV_NAME("echospace", VAR_NUMBER), VV_RO}, {VV_NAME("echospace", VAR_NUMBER), VV_RO},
{VV_NAME("argv", VAR_LIST), VV_RO}, {VV_NAME("argv", VAR_LIST), VV_RO},
{VV_NAME("collate", VAR_STRING), VV_RO}, {VV_NAME("collate", VAR_STRING), VV_RO},
{VV_NAME("disallow_let", VAR_NUMBER), 0}, // TODO: remove
}; };
// shorthand // shorthand
@@ -243,9 +242,6 @@ evalvars_init(void)
set_vim_var_nr(VV_ECHOSPACE, sc_col - 1); 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 // Default for v:register is not 0 but '"'. This is adjusted once the
// clipboard has been setup by calling reset_reg_var(). // clipboard has been setup by calling reset_reg_var().
set_reg_var(0); set_reg_var(0);
@@ -749,8 +745,7 @@ ex_let(exarg_T *eap)
ex_finally(eap); ex_finally(eap);
return; return;
} }
if (get_vim_var_nr(VV_DISALLOW_LET) if (eap->cmdidx == CMD_let && vim9script)
&& eap->cmdidx == CMD_let && vim9script)
{ {
emsg(_(e_cannot_use_let_in_vim9_script)); emsg(_(e_cannot_use_let_in_vim9_script));
return; return;

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1882,
/**/ /**/
1881, 1881,
/**/ /**/

3
src/vim.h
View File

@@ -1994,8 +1994,7 @@ typedef int sock_T;
#define VV_ECHOSPACE 93 #define VV_ECHOSPACE 93
#define VV_ARGV 94 #define VV_ARGV 94
#define VV_COLLATE 95 #define VV_COLLATE 95
#define VV_DISALLOW_LET 96 // TODO: remove again #define VV_LEN 96 // number of v: vars
#define VV_LEN 97 // number of v: vars
// used for v_number in VAR_BOOL and VAR_SPECIAL // used for v_number in VAR_BOOL and VAR_SPECIAL
#define VVAL_FALSE 0L // VAR_BOOL #define VVAL_FALSE 0L // VAR_BOOL

4
src/vim9compile.c
View File

@@ -7319,12 +7319,8 @@ compile_def_function(ufunc_T *ufunc, int set_return_type, cctx_T *outer_cctx)
break; break;
case CMD_let: case CMD_let:
if (get_vim_var_nr(VV_DISALLOW_LET))
{
emsg(_(e_cannot_use_let_in_vim9_script)); emsg(_(e_cannot_use_let_in_vim9_script));
break; break;
}
// FALLTHROUGH
case CMD_var: case CMD_var:
case CMD_final: case CMD_final:
case CMD_const: case CMD_const: