mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-30 15:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1553

Browse Source 
Problem:    ":runtime" does not use 'packpath'.
Solution:   Add "what" argument.

8dcf259d90
This commit is contained in:
James McCoy
2016-06-21 23:13:46 -04:00
parent 080476882b
commit 53613e7fcd
5 changed files with 113 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/nvim/ex_cmds2.c
View File

@@ -2263,10 +2263,29 @@ void ex_compiler(exarg_T *eap)
}
}
/// ":runtime {name}"
/// ":runtime [what] {name}"
void ex_runtime(exarg_T *eap)
{
source_runtime(eap->arg, eap->forceit ? DIP_ALL : 0);
char_u *arg = eap->arg;
char_u *p = skiptowhite(arg);
ptrdiff_t len = p - arg;
int flags = eap->forceit ? DIP_ALL : 0;
if (STRNCMP(arg, "START", len) == 0) {
flags += DIP_START + DIP_NORTP;
arg = skipwhite(arg + len);
} else if (STRNCMP(arg, "OPT", len) == 0) {
flags += DIP_OPT + DIP_NORTP;
arg = skipwhite(arg + len);
} else if (STRNCMP(arg, "PACK", len) == 0) {
flags += DIP_START + DIP_OPT + DIP_NORTP;
arg = skipwhite(arg + len);
} else if (STRNCMP(arg, "ALL", len) == 0) {
flags += DIP_START + DIP_OPT;
arg = skipwhite(arg + len);
}
source_runtime(arg, flags);
}
@@ -2388,9 +2407,13 @@ int do_in_path(char_u *path, char_u *name, int flags,
int do_in_runtimepath(char_u *name, int flags, DoInRuntimepathCB callback,
void *cookie)
{
int done = do_in_path(p_rtp, name, flags, callback, cookie);
int done = FAIL;
if (done == FAIL && (flags & DIP_START)) {
if ((flags & DIP_NORTP) == 0) {
done = do_in_path(p_rtp, name, flags, callback, cookie);
}
if ((done == FAIL || (flags & DIP_ALL)) && (flags & DIP_START)) {
char *start_dir = "pack/*/start/*/%s";
size_t len = STRLEN(start_dir) + STRLEN(name);
char_u *s = xmallocz(len);
@@ -2401,7 +2424,7 @@ int do_in_runtimepath(char_u *name, int flags, DoInRuntimepathCB callback,
xfree(s);
}
if (done == FAIL && (flags & DIP_OPT)) {
if ((done == FAIL || (flags & DIP_ALL)) && (flags & DIP_OPT)) {
char *opt_dir = "pack/*/opt/*/%s";
size_t len = STRLEN(opt_dir) + STRLEN(name);
char_u *s = xmallocz(len);