diff options
| -rw-r--r-- | src/ex_cmds.h | 3 | ||||
| -rw-r--r-- | src/ex_cmds2.c | 11 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/proto/ex_cmds2.pro | 3 | ||||
| -rw-r--r-- | src/testdir/test_packadd.vim | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
6 files changed, 33 insertions, 5 deletions
diff --git a/src/ex_cmds.h b/src/ex_cmds.h index c25ee2ee6..34defea44 100644 --- a/src/ex_cmds.h +++ b/src/ex_cmds.h @@ -1014,6 +1014,9 @@ EX(CMD_print, "print", ex_print, EX(CMD_packadd, "packadd", ex_packadd, BANG|FILE1|NEEDARG|TRLBAR|SBOXOK|CMDWIN, ADDR_LINES), +EX(CMD_packloadall, "packloadall", ex_packloadall, + BANG|TRLBAR|SBOXOK|CMDWIN, + ADDR_LINES), EX(CMD_pclose, "pclose", ex_pclose, BANG|TRLBAR, ADDR_LINES), diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 19d7d19fa..616f7a078 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -3189,14 +3189,21 @@ theend: vim_free(ffname); } +static int did_source_packages = FALSE; + /* + * ":packloadall" * Find plugins in the package directories and source them. */ void -source_packages() +ex_packloadall(exarg_T *eap) { - do_in_path(p_pp, (char_u *)"pack/*/start/*", DIP_ALL + DIP_DIR, + if (!did_source_packages || (eap != NULL && eap->forceit)) + { + did_source_packages = TRUE; + do_in_path(p_pp, (char_u *)"pack/*/start/*", DIP_ALL + DIP_DIR, add_pack_plugin, p_pp); + } } /* diff --git a/src/main.c b/src/main.c index 076898c34..7bbf248e4 100644 --- a/src/main.c +++ b/src/main.c @@ -634,7 +634,7 @@ vim_main2(int argc UNUSED, char **argv UNUSED) # endif TIME_MSG("loading plugins"); - source_packages(); + ex_packloadall(NULL); TIME_MSG("loading packages"); } #endif diff --git a/src/proto/ex_cmds2.pro b/src/proto/ex_cmds2.pro index e10f07241..1f1177429 100644 --- a/src/proto/ex_cmds2.pro +++ b/src/proto/ex_cmds2.pro @@ -62,8 +62,7 @@ void ex_compiler(exarg_T *eap); void ex_runtime(exarg_T *eap); int source_runtime(char_u *name, int all); int do_in_runtimepath(char_u *name, int all, void (*callback)(char_u *fname, void *ck), void *cookie); -void source_packages(void); -void ex_loadplugin(exarg_T *eap); +void ex_packloadall(exarg_T *eap); void ex_packadd(exarg_T *eap); void ex_options(exarg_T *eap); void ex_source(exarg_T *eap); diff --git a/src/testdir/test_packadd.vim b/src/testdir/test_packadd.vim index a0a270149..2b66f6d32 100644 --- a/src/testdir/test_packadd.vim +++ b/src/testdir/test_packadd.vim @@ -80,3 +80,20 @@ func Test_packadd_completion() call assert_equal("packadd pluginC", li[2]) call assert_equal("packadd ", li[3]) endfunc + +func Test_packloadall() + let plugindir = &packpath . '/pack/mine/start/foo/plugin' + call mkdir(plugindir, 'p') + call writefile(['let g:plugin_foo_number = 1234'], plugindir . '/bar.vim') + packloadall + call assert_equal(1234, g:plugin_foo_number) + + " only works once + call writefile(['let g:plugin_bar_number = 4321'], plugindir . '/bar2.vim') + packloadall + call assert_false(exists('g:plugin_bar_number')) + + " works when ! used + packloadall! + call assert_equal(4321, g:plugin_bar_number) +endfunc diff --git a/src/version.c b/src/version.c index 87fdebcde..4f66f9d48 100644 --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1550, +/**/ 1549, /**/ 1548, |