Skip to content

Commit

Permalink
patch 9.1.0403: Vim9: not able to import file from start dir
Browse files Browse the repository at this point in the history
Problem:  Vim9: not able to import file from start dir
          (Danielle McLean)
Solution: Allow to import from start directory
          (Yegappan Lakshmanan)

fixes: #13313
closes: #14740

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
  • Loading branch information
yegappan authored and chrisbra committed May 10, 2024
1 parent 63f2a5b commit 8c35c26
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/scriptfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ find_script_in_rtp(char_u *name)
{
int sid = -1;

(void)do_in_path_and_pp(p_rtp, name, DIP_NOAFTER,
(void)do_in_path_and_pp(p_rtp, name, DIP_START | DIP_NOAFTER,
find_script_callback, &sid);
return sid;
}
Expand Down
28 changes: 28 additions & 0 deletions src/testdir/test_vim9_import.vim
Original file line number Diff line number Diff line change
Expand Up @@ -3283,4 +3283,32 @@ def Test_set_imported_class_member()
v9.CheckScriptSuccess(lines)
enddef

" Test for using an imported function from the vimrc file.  The function is
" defined in the 'start' directory of a package.
def Test_import_from_vimrc()
mkdir('Ximport/pack/foobar/start/foo/autoload', 'pR')
var lines =<< trim END
vim9script
export def Foo()
writefile(['Foo called'], 'Xoutput.log')
enddef
END
writefile(lines, 'Ximport/pack/foobar/start/foo/autoload/foo.vim')
lines =<< trim END
vim9script
set packpath+=./Ximport
try
import autoload 'foo.vim'
foo.Foo()
catch
writefile(['Failed to import foo.vim'], 'Xoutput.log')
endtry
qall!
END
writefile(lines, 'Xvimrc', 'D')
g:RunVim([], [], '-u Xvimrc')
assert_equal(['Foo called'], readfile('Xoutput.log'))
delete('Xoutput.log')
enddef

" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
403,
/**/
402,
/**/
Expand Down

0 comments on commit 8c35c26

Please sign in to comment.