diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-03-31 16:18:23 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-03-31 16:18:23 +0100 |
commit | ccbfd4883f0385a1d84cc87785ddcc86185b4ad9 (patch) | |
tree | 65f63c71b3792956985261e7ae0e4a02df0e9884 /src/vim9instr.c | |
parent | 1104a6d0c2004d39e9b6cb8f804d12b628a69869 (diff) |
patch 8.2.4656: Vim9: can't use item from "import autoload" with autoload dirv8.2.4656
Problem: Vim9: can't use items from "import autoload" with autoload
directory name.
Solution: Let sn_autoload_prefix overrule sn_import_autoload.
(closes #10054)
Diffstat (limited to 'src/vim9instr.c')
-rw-r--r-- | src/vim9instr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/vim9instr.c b/src/vim9instr.c index ae828cbe7d..ab52d4c4c3 100644 --- a/src/vim9instr.c +++ b/src/vim9instr.c @@ -1932,7 +1932,9 @@ generate_store_var( isntype_T isn_type = ISN_STORES; if (SCRIPT_ID_VALID(scriptvar_sid) - && SCRIPT_ITEM(scriptvar_sid)->sn_import_autoload) + && SCRIPT_ITEM(scriptvar_sid)->sn_import_autoload + && SCRIPT_ITEM(scriptvar_sid)->sn_autoload_prefix + == NULL) { // "import autoload './dir/script.vim'" - load script first if (generate_SOURCE(cctx, scriptvar_sid) == FAIL) |