0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

patch 7.4.1550

Problem:    Cannot load packages early.
Solution:   Add the ":packloadall" command.
This commit is contained in:
Bram Moolenaar 2016-03-12 20:34:27 +01:00
parent c835293d54
commit 2d8f56acb3
6 changed files with 33 additions and 5 deletions

View File

@ -1014,6 +1014,9 @@ EX(CMD_print, "print", ex_print,
EX(CMD_packadd, "packadd", ex_packadd, EX(CMD_packadd, "packadd", ex_packadd,
BANG|FILE1|NEEDARG|TRLBAR|SBOXOK|CMDWIN, BANG|FILE1|NEEDARG|TRLBAR|SBOXOK|CMDWIN,
ADDR_LINES), ADDR_LINES),
EX(CMD_packloadall, "packloadall", ex_packloadall,
BANG|TRLBAR|SBOXOK|CMDWIN,
ADDR_LINES),
EX(CMD_pclose, "pclose", ex_pclose, EX(CMD_pclose, "pclose", ex_pclose,
BANG|TRLBAR, BANG|TRLBAR,
ADDR_LINES), ADDR_LINES),

View File

@ -3189,14 +3189,21 @@ theend:
vim_free(ffname); vim_free(ffname);
} }
static int did_source_packages = FALSE;
/* /*
* ":packloadall"
* Find plugins in the package directories and source them. * Find plugins in the package directories and source them.
*/ */
void 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); add_pack_plugin, p_pp);
}
} }
/* /*

View File

@ -634,7 +634,7 @@ vim_main2(int argc UNUSED, char **argv UNUSED)
# endif # endif
TIME_MSG("loading plugins"); TIME_MSG("loading plugins");
source_packages(); ex_packloadall(NULL);
TIME_MSG("loading packages"); TIME_MSG("loading packages");
} }
#endif #endif

View File

@ -62,8 +62,7 @@ void ex_compiler(exarg_T *eap);
void ex_runtime(exarg_T *eap); void ex_runtime(exarg_T *eap);
int source_runtime(char_u *name, int all); 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); int do_in_runtimepath(char_u *name, int all, void (*callback)(char_u *fname, void *ck), void *cookie);
void source_packages(void); void ex_packloadall(exarg_T *eap);
void ex_loadplugin(exarg_T *eap);
void ex_packadd(exarg_T *eap); void ex_packadd(exarg_T *eap);
void ex_options(exarg_T *eap); void ex_options(exarg_T *eap);
void ex_source(exarg_T *eap); void ex_source(exarg_T *eap);

View File

@ -80,3 +80,20 @@ func Test_packadd_completion()
call assert_equal("packadd pluginC", li[2]) call assert_equal("packadd pluginC", li[2])
call assert_equal("packadd ", li[3]) call assert_equal("packadd ", li[3])
endfunc 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

View File

@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1550,
/**/ /**/
1549, 1549,
/**/ /**/