thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1398: :packadd does not load packages from the "start" directory

Browse Source 
Problem:    :packadd does not load packages from the "start" directory.
            (Alejandro Hernandez)
Solution:   Make :packadd look in the "start" directory if those packages were
            not loaded on startup.
This commit is contained in:
Bram Moolenaar
2017-12-17 14:26:46 +01:00
parent 890dd05492
commit 9e1d399e63
3 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/ex_cmds2.c
View File

@@ -3747,18 +3747,31 @@ ex_packloadall(exarg_T *eap)
void
ex_packadd(exarg_T *eap)
{
static char *plugpat = "pack/*/opt/%s";
static char *plugpat = "pack/*/%s/%s";
int len;
char *pat;
int round;
int res = OK;
len = (int)STRLEN(plugpat) + (int)STRLEN(eap->arg);
pat = (char *)alloc(len);
if (pat == NULL)
return;
vim_snprintf(pat, len, plugpat, eap->arg);
do_in_path(p_pp, (char_u *)pat, DIP_ALL + DIP_DIR + DIP_ERR,
add_pack_plugin, eap->forceit ? &APP_ADD_DIR : &APP_BOTH);
vim_free(pat);
/* Round 1: use "start", round 2: use "opt". */
for (round = 1; round <= 2; ++round)
{
/* Only look under "start" when loading packages wasn't done yet. */
if (round == 1 && did_source_packages)
continue;
len = (int)STRLEN(plugpat) + (int)STRLEN(eap->arg) + 5;
pat = (char *)alloc(len);
if (pat == NULL)
return;
vim_snprintf(pat, len, plugpat, round == 1 ? "start" : "opt", eap->arg);
/* The first round don't give a "not found" error, in the second round
* only when nothing was found in the first round. */
res = do_in_path(p_pp, (char_u *)pat,
DIP_ALL + DIP_DIR + (round == 2 && res == FAIL ? DIP_ERR : 0),
add_pack_plugin, eap->forceit ? &APP_ADD_DIR : &APP_BOTH);
vim_free(pat);
}
}
#if defined(FEAT_EVAL) && defined(FEAT_AUTOCMD)