]> granicus.if.org Git - vim/commitdiff
patch 8.2.1882: Vim9: v:disallow_let is no longer needed v8.2.1882
authorBram Moolenaar <Bram@vim.org>
Wed, 21 Oct 2020 18:58:52 +0000 (20:58 +0200)
committerBram Moolenaar <Bram@vim.org>
Wed, 21 Oct 2020 18:58:52 +0000 (20:58 +0200)
Problem:    Vim9: v:disallow_let is no longer needed.
Solution:   Remove v:disallow_let.

src/evalvars.c
src/version.c
src/vim.h
src/vim9compile.c

index fd67ad0f5ec43870eb2eeb8e0cb910558bbe1e48..b3ad2c99c8818cda6bc2cd4548dad35aea6ba6db 100644 (file)
@@ -146,7 +146,6 @@ static struct vimvar
     {VV_NAME("echospace",       VAR_NUMBER), VV_RO},
     {VV_NAME("argv",            VAR_LIST), VV_RO},
     {VV_NAME("collate",                 VAR_STRING), VV_RO},
-    {VV_NAME("disallow_let",    VAR_NUMBER), 0}, // TODO: remove
 };
 
 // shorthand
@@ -243,9 +242,6 @@ 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);
@@ -749,8 +745,7 @@ ex_let(exarg_T *eap)
            ex_finally(eap);
            return;
     }
-    if (get_vim_var_nr(VV_DISALLOW_LET)
-                                     && eap->cmdidx == CMD_let && vim9script)
+    if (eap->cmdidx == CMD_let && vim9script)
     {
        emsg(_(e_cannot_use_let_in_vim9_script));
        return;
index b5fda34be39c688d31ab4ef243699b3957dd4472..fde646d5719bd1f48efb5e4a5d8837edde9979af 100644 (file)
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1882,
 /**/
     1881,
 /**/
index 5ae8b793195f51ee01dcec47afc77ea4ae4d1299..64cf6d48da0e632577f19c1226f9ea96fcb3abac 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -1994,8 +1994,7 @@ typedef int sock_T;
 #define VV_ECHOSPACE   93
 #define VV_ARGV                94
 #define VV_COLLATE      95
-#define VV_DISALLOW_LET 96     // TODO: remove again
-#define VV_LEN         97      // number of v: vars
+#define VV_LEN         96      // number of v: vars
 
 // used for v_number in VAR_BOOL and VAR_SPECIAL
 #define VVAL_FALSE     0L      // VAR_BOOL
index 934b4d6b115ae32791cc4dc86553606415cd14f6..7ae47b393deb189cffcae64108e4bbc3f6ed1aff 100644 (file)
@@ -7319,12 +7319,8 @@ compile_def_function(ufunc_T *ufunc, int set_return_type, cctx_T *outer_cctx)
                    break;
 
            case CMD_let:
-                   if (get_vim_var_nr(VV_DISALLOW_LET))
-                   {
-                       emsg(_(e_cannot_use_let_in_vim9_script));
-                       break;
-                   }
-                   // FALLTHROUGH
+                   emsg(_(e_cannot_use_let_in_vim9_script));
+                   break;
            case CMD_var:
            case CMD_final:
            case CMD_const: