Mercurial > vim
comparison src/evalvars.c @ 22667:87987c783087 v8.2.1882
patch 8.2.1882: Vim9: v:disallow_let is no longer needed
Commit: https://github.com/vim/vim/commit/c58f5456e5c5f21193e960cecc434e367ef1281e
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Oct 21 20:58:52 2020 +0200
patch 8.2.1882: Vim9: v:disallow_let is no longer needed
Problem: Vim9: v:disallow_let is no longer needed.
Solution: Remove v:disallow_let.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 21 Oct 2020 21:00:04 +0200 |
parents | 2c77ec32deeb |
children | dda110a14be4 |
comparison
equal
deleted
inserted
replaced
22666:7d3426b50a43 | 22667:87987c783087 |
---|---|
144 {VV_NAME("event", VAR_DICT), VV_RO}, | 144 {VV_NAME("event", VAR_DICT), VV_RO}, |
145 {VV_NAME("versionlong", VAR_NUMBER), VV_RO}, | 145 {VV_NAME("versionlong", VAR_NUMBER), VV_RO}, |
146 {VV_NAME("echospace", VAR_NUMBER), VV_RO}, | 146 {VV_NAME("echospace", VAR_NUMBER), VV_RO}, |
147 {VV_NAME("argv", VAR_LIST), VV_RO}, | 147 {VV_NAME("argv", VAR_LIST), VV_RO}, |
148 {VV_NAME("collate", VAR_STRING), VV_RO}, | 148 {VV_NAME("collate", VAR_STRING), VV_RO}, |
149 {VV_NAME("disallow_let", VAR_NUMBER), 0}, // TODO: remove | |
150 }; | 149 }; |
151 | 150 |
152 // shorthand | 151 // shorthand |
153 #define vv_type vv_di.di_tv.v_type | 152 #define vv_type vv_di.di_tv.v_type |
154 #define vv_nr vv_di.di_tv.vval.v_number | 153 #define vv_nr vv_di.di_tv.vval.v_number |
240 set_vim_var_nr(VV_TYPE_JOB, VAR_TYPE_JOB); | 239 set_vim_var_nr(VV_TYPE_JOB, VAR_TYPE_JOB); |
241 set_vim_var_nr(VV_TYPE_CHANNEL, VAR_TYPE_CHANNEL); | 240 set_vim_var_nr(VV_TYPE_CHANNEL, VAR_TYPE_CHANNEL); |
242 set_vim_var_nr(VV_TYPE_BLOB, VAR_TYPE_BLOB); | 241 set_vim_var_nr(VV_TYPE_BLOB, VAR_TYPE_BLOB); |
243 | 242 |
244 set_vim_var_nr(VV_ECHOSPACE, sc_col - 1); | 243 set_vim_var_nr(VV_ECHOSPACE, sc_col - 1); |
245 | |
246 // TODO: remove later | |
247 set_vim_var_nr(VV_DISALLOW_LET, 1); | |
248 | 244 |
249 // Default for v:register is not 0 but '"'. This is adjusted once the | 245 // Default for v:register is not 0 but '"'. This is adjusted once the |
250 // clipboard has been setup by calling reset_reg_var(). | 246 // clipboard has been setup by calling reset_reg_var(). |
251 set_reg_var(0); | 247 set_reg_var(0); |
252 } | 248 } |
747 { | 743 { |
748 // In legacy Vim script ":final" is short for ":finally". | 744 // In legacy Vim script ":final" is short for ":finally". |
749 ex_finally(eap); | 745 ex_finally(eap); |
750 return; | 746 return; |
751 } | 747 } |
752 if (get_vim_var_nr(VV_DISALLOW_LET) | 748 if (eap->cmdidx == CMD_let && vim9script) |
753 && eap->cmdidx == CMD_let && vim9script) | |
754 { | 749 { |
755 emsg(_(e_cannot_use_let_in_vim9_script)); | 750 emsg(_(e_cannot_use_let_in_vim9_script)); |
756 return; | 751 return; |
757 } | 752 } |
758 if (eap->cmdidx == CMD_const && !vim9script && !eap->forceit) | 753 if (eap->cmdidx == CMD_const && !vim9script && !eap->forceit) |