diff options
| -rw-r--r-- | src/ex_cmds2.c | 32 | ||||
| -rw-r--r-- | src/globals.h | 2 | ||||
| -rw-r--r-- | src/main.c | 11 | ||||
| -rw-r--r-- | src/proto/ex_cmds2.pro | 2 | ||||
| -rw-r--r-- | src/testdir/test_startup.vim | 32 | ||||
| -rw-r--r-- | src/version.c | 2 |
6 files changed, 71 insertions, 10 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 36ee57e8e..225225a78 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -3633,27 +3633,41 @@ theend: vim_free(ffname); } -static int did_source_packages = FALSE; +/* + * Add all packages in the "start" directory to 'runtimepath'. + */ + void +add_pack_start_dirs(void) +{ + do_in_path(p_pp, (char_u *)"pack/*/start/*", DIP_ALL + DIP_DIR, + add_pack_plugin, &APP_ADD_DIR); +} + +/* + * Load plugins from all packages in the "start" directory. + */ + void +load_start_packages(void) +{ + did_source_packages = TRUE; + do_in_path(p_pp, (char_u *)"pack/*/start/*", DIP_ALL + DIP_DIR, + add_pack_plugin, &APP_LOAD); +} /* * ":packloadall" * Find plugins in the package directories and source them. - * "eap" is NULL when invoked during startup. */ void ex_packloadall(exarg_T *eap) { - if (!did_source_packages || (eap != NULL && eap->forceit)) + if (!did_source_packages || eap->forceit) { - did_source_packages = TRUE; - /* First do a round to add all directories to 'runtimepath', then load * the plugins. This allows for plugins to use an autoload directory * of another plugin. */ - do_in_path(p_pp, (char_u *)"pack/*/start/*", DIP_ALL + DIP_DIR, - add_pack_plugin, &APP_ADD_DIR); - do_in_path(p_pp, (char_u *)"pack/*/start/*", DIP_ALL + DIP_DIR, - add_pack_plugin, &APP_LOAD); + add_pack_start_dirs(); + load_start_packages(); } } diff --git a/src/globals.h b/src/globals.h index 7bc547176..56df6d508 100644 --- a/src/globals.h +++ b/src/globals.h @@ -326,6 +326,8 @@ EXTERN int garbage_collect_at_exit INIT(= FALSE); EXTERN scid_T current_SID INIT(= 0); #endif +EXTERN int did_source_packages INIT(= FALSE); + /* Magic number used for hashitem "hi_key" value indicating a deleted item. * Only the address is used. */ EXTERN char_u hash_removed; diff --git a/src/main.c b/src/main.c index ebd1ec333..0c7aa9846 100644 --- a/src/main.c +++ b/src/main.c @@ -449,6 +449,12 @@ vim_main2(void) */ if (p_lpl) { + /* First add all package directories to 'runtimepath', so that their + * autoload directories can be found. Only if not done already with a + * :packloadall command. */ + if (!did_source_packages) + add_pack_start_dirs(); + # ifdef VMS /* Somehow VMS doesn't handle the "**". */ source_runtime((char_u *)"plugin/*.vim", DIP_ALL | DIP_NOAFTER); # else @@ -456,7 +462,10 @@ vim_main2(void) # endif TIME_MSG("loading plugins"); - ex_packloadall(NULL); + /* Only source "start" packages if not done already with a :packloadall + * command. */ + if (!did_source_packages) + load_start_packages(); TIME_MSG("loading packages"); # ifdef VMS /* Somehow VMS doesn't handle the "**". */ diff --git a/src/proto/ex_cmds2.pro b/src/proto/ex_cmds2.pro index 4a40f0a76..e8d281408 100644 --- a/src/proto/ex_cmds2.pro +++ b/src/proto/ex_cmds2.pro @@ -72,6 +72,8 @@ void ex_runtime(exarg_T *eap); int source_runtime(char_u *name, int flags); int do_in_path(char_u *path, char_u *name, int flags, void (*callback)(char_u *fname, void *ck), void *cookie); int do_in_runtimepath(char_u *name, int flags, void (*callback)(char_u *fname, void *ck), void *cookie); +void add_pack_start_dirs(void); +void load_start_packages(void); void ex_packloadall(exarg_T *eap); void ex_packadd(exarg_T *eap); void ex_options(exarg_T *eap); diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index bce431f7d..08a107e81 100644 --- a/src/testdir/test_startup.vim +++ b/src/testdir/test_startup.vim @@ -61,6 +61,38 @@ func Test_after_comes_later() call delete('Xafter', 'rf') endfunc +func Test_pack_in_rtp_when_plugins_run() + if !has('packages') + return + endif + let before = [ + \ 'set nocp viminfo+=nviminfo', + \ 'set guioptions+=M', + \ 'let $HOME = "/does/not/exist"', + \ 'set loadplugins', + \ 'set rtp=Xhere', + \ 'set packpath=Xhere', + \ 'set nomore', + \ ] + let after = [ + \ 'quit', + \ ] + call mkdir('Xhere/plugin', 'p') + call writefile(['redir! > Xtestout', 'silent set runtimepath?', 'silent! call foo#Trigger()', 'redir END'], 'Xhere/plugin/here.vim') + call mkdir('Xhere/pack/foo/start/foobar/autoload', 'p') + call writefile(['function! foo#Trigger()', 'echo "autoloaded foo"', 'endfunction'], 'Xhere/pack/foo/start/foobar/autoload/foo.vim') + + if RunVim(before, after, '') + + let lines = filter(readfile('Xtestout'), '!empty(v:val)') + call assert_match('Xhere[/\\]pack[/\\]foo[/\\]start[/\\]foobar', get(lines, 0)) + call assert_match('autoloaded foo', get(lines, 1)) + endif + + call delete('Xtestout') + call delete('Xhere', 'rf') +endfunc + func Test_help_arg() if !has('unix') && has('gui') " this doesn't work with gvim on MS-Windows diff --git a/src/version.c b/src/version.c index 2d91a7259..91cd50052 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 612, +/**/ 611, /**/ 610, |