From 47bc9c333766ee3d45cb18c583a630e4ad53405a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 17 Jul 2021 21:24:56 +0200 Subject: patch 8.2.3174: Vim9: "legacy undo" finds "undo" variable Problem: Vim9: "legacy undo" finds "undo" variable. Solution: Do not pass lookup function to find_ex_command(). (closes #8563) --- src/testdir/test_vim9_assign.vim | 7 +++++++ src/version.c | 2 ++ src/vim9compile.c | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim index 3599d6c5d1..a33038c9a1 100644 --- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -1632,6 +1632,13 @@ def Test_script_local_in_legacy() let s:legvar = 'one' END CheckScriptFailure(lines, 'E476:', 1) + + edit! Xfile + lines =<< trim END + var edit: bool + legacy edit + END + CheckDefAndScriptSuccess(lines) enddef def Test_var_type_check() diff --git a/src/version.c b/src/version.c index f7e2c17a0a..e1421ddb4e 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3174, /**/ 3173, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index 956ce44eb0..9ae11a54b1 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -9510,7 +9510,8 @@ compile_def_function( } } } - p = find_ex_command(&ea, NULL, starts_with_colon + p = find_ex_command(&ea, NULL, + starts_with_colon || (local_cmdmod.cmod_flags & CMOD_LEGACY) ? NULL : item_exists, &cctx); if (p == NULL) -- cgit v1.2.3