aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/main.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-11-27 21:27:07 -0500
committerGitHub <noreply@github.com>2020-11-27 21:27:07 -0500
commitba13b94f5aab734bdb242d515ac43d973ba6c6c5 (patch)
tree82dc3000076054f785ee358db67dec32dd10fee0 /src/nvim/main.c
parentd956842751aaf88656825b236c27020596d96b6a (diff)
parenta3922e03a976d1623f89b07071f6a4581c84ec62 (diff)
downloadrneovim-ba13b94f5aab734bdb242d515ac43d973ba6c6c5.tar.gz
rneovim-ba13b94f5aab734bdb242d515ac43d973ba6c6c5.tar.bz2
rneovim-ba13b94f5aab734bdb242d515ac43d973ba6c6c5.zip
Merge pull request #13402 from janlazo/vim-8.2.2056
vim-patch:8.1.0951,8.2.{271,594,965,1370,2056,2059}
Diffstat (limited to 'src/nvim/main.c')
-rw-r--r--src/nvim/main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 941258fa79..63249416b1 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -1333,6 +1333,7 @@ static void load_plugins(void)
{
if (p_lpl) {
char_u *rtp_copy = NULL;
+ char_u *const plugin_pattern = (char_u *)"plugin/**/*.vim"; // NOLINT
// First add all package directories to 'runtimepath', so that their
// autoload directories can be found. Only if not done already with a
@@ -1345,7 +1346,7 @@ static void load_plugins(void)
}
source_in_path(rtp_copy == NULL ? p_rtp : rtp_copy,
- (char_u *)"plugin/**/*.vim", // NOLINT
+ plugin_pattern,
DIP_ALL | DIP_NOAFTER);
TIME_MSG("loading plugins");
xfree(rtp_copy);
@@ -1357,7 +1358,7 @@ static void load_plugins(void)
}
TIME_MSG("loading packages");
- source_runtime((char_u *)"plugin/**/*.vim", DIP_ALL | DIP_AFTER);
+ source_runtime(plugin_pattern, DIP_ALL | DIP_AFTER);
TIME_MSG("loading after plugins");
}
}