From 783c9aac8ee300ba3e9850de26b523554ceab495 Mon Sep 17 00:00:00 2001 From: Michael Ennen Date: Tue, 29 Nov 2016 15:19:25 -0700 Subject: vim-patch:7.4.1699 (#5660) Problem: :packadd does not work the same when used early or late. Solution: Always load plugins matching "plugin/**/*.vim". https://github.com/vim/vim/commit/71fb0c146bef08dc276fc5793bd47366e6e0f32a --- src/nvim/ex_cmds2.c | 2 +- src/nvim/version.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index f68663c60c..3b92b3734a 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -2552,7 +2552,7 @@ static void add_pack_plugin(char_u *fname, void *cookie) } if (cookie != &APP_ADD_DIR) { - static const char *plugpat = "%s/plugin/*.vim"; // NOLINT + static const char *plugpat = "%s/plugin/**/*.vim"; // NOLINT static const char *ftpat = "%s/ftdetect/*.vim"; // NOLINT size_t len = STRLEN(ffname) + STRLEN(ftpat); diff --git a/src/nvim/version.c b/src/nvim/version.c index 82a6f5f9a9..eaf44f42b8 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -745,7 +745,7 @@ static int included_patches[] = { // 1702, // 1701, 1700, - // 1699, + 1699, // 1698 NA 1697, 1696, -- cgit