Mercurial > vim

diff src/vim9instr.c @ 28261:20f6b0cdf38c v8.2.4656

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4656: Vim9: can't use item from "import autoload" with autoload dir Commit: https://github.com/vim/vim/commit/ccbfd4883f0385a1d84cc87785ddcc86185b4ad9 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Mar 31 16:18:23 2022 +0100 patch 8.2.4656: Vim9: can't use item from "import autoload" with autoload dir Problem: Vim9: can't use items from "import autoload" with autoload directory name. Solution: Let sn_autoload_prefix overrule sn_import_autoload. (closes #10054)
author Bram Moolenaar <Bram@vim.org>
date Thu, 31 Mar 2022 17:30:03 +0200
parents 4b322951ebac
children c446812efd60
line wrap: on
line diff
--- 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)