To: vim_dev@googlegroups.com Subject: Patch 8.2.1882 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1882 Problem: Vim9: v:disallow_let is no longer needed. Solution: Remove v:disallow_let. Files: src/evalvars.c, src/vim.h, src/vim9compile.c *** ../vim-8.2.1881/src/evalvars.c 2020-10-15 20:42:16.414311131 +0200 --- src/evalvars.c 2020-10-21 20:05:49.849848329 +0200 *************** *** 146,152 **** {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 --- 146,151 ---- *************** *** 243,251 **** 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); --- 242,247 ---- *************** *** 749,756 **** ex_finally(eap); return; } ! if (get_vim_var_nr(VV_DISALLOW_LET) ! && eap->cmdidx == CMD_let && vim9script) { emsg(_(e_cannot_use_let_in_vim9_script)); return; --- 745,751 ---- ex_finally(eap); return; } ! if (eap->cmdidx == CMD_let && vim9script) { emsg(_(e_cannot_use_let_in_vim9_script)); return; *** ../vim-8.2.1881/src/vim.h 2020-10-21 12:19:50.080854732 +0200 --- src/vim.h 2020-10-21 20:06:29.525726608 +0200 *************** *** 1994,2001 **** #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 // used for v_number in VAR_BOOL and VAR_SPECIAL #define VVAL_FALSE 0L // VAR_BOOL --- 1994,2000 ---- #define VV_ECHOSPACE 93 #define VV_ARGV 94 #define VV_COLLATE 95 ! #define VV_LEN 96 // number of v: vars // used for v_number in VAR_BOOL and VAR_SPECIAL #define VVAL_FALSE 0L // VAR_BOOL *** ../vim-8.2.1881/src/vim9compile.c 2020-10-21 16:49:13.992979808 +0200 --- src/vim9compile.c 2020-10-21 20:06:21.593750942 +0200 *************** *** 7319,7330 **** break; case CMD_let: ! if (get_vim_var_nr(VV_DISALLOW_LET)) ! { ! emsg(_(e_cannot_use_let_in_vim9_script)); ! break; ! } ! // FALLTHROUGH case CMD_var: case CMD_final: case CMD_const: --- 7319,7326 ---- break; case CMD_let: ! emsg(_(e_cannot_use_let_in_vim9_script)); ! break; case CMD_var: case CMD_final: case CMD_const: *** ../vim-8.2.1881/src/version.c 2020-10-21 17:28:23.922809103 +0200 --- src/version.c 2020-10-21 20:58:02.855028822 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 1882, /**/ -- hundred-and-one symptoms of being an internet addict: 100. The most exciting sporting events you noticed during summer 1996 was Netscape vs. Microsoft. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///