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.1699 (#5660)

Browse Source 
Problem:    :packadd does not work the same when used early or late.
Solution:   Always load plugins matching "plugin/**/*.vim".

71fb0c146b
This commit is contained in:
Michael Ennen
2016-11-29 15:19:25 -07:00
committed by Justin M. Keyes
parent 3979c6cbed
commit 783c9aac8e
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/ex_cmds2.c
View File

@@ -2552,7 +2552,7 @@ static void add_pack_plugin(char_u *fname, void *cookie)
} }
if (cookie != &APP_ADD_DIR) { 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 static const char *ftpat = "%s/ftdetect/*.vim"; // NOLINT
size_t len = STRLEN(ffname) + STRLEN(ftpat); size_t len = STRLEN(ffname) + STRLEN(ftpat);

2
src/nvim/version.c
View File

@@ -745,7 +745,7 @@ static int included_patches[] = {
// 1702, // 1702,
// 1701, // 1701,
1700, 1700,
// 1699, 1699,
// 1698 NA // 1698 NA
1697, 1697,
1696, 1696,

7
test/functional/legacy/packadd_spec.lua
View File

@@ -27,7 +27,7 @@ describe('packadd', function()
endfunc endfunc
func Test_packadd() func Test_packadd()
call mkdir(s:plugdir . '/plugin', 'p') call mkdir(s:plugdir . '/plugin/also', 'p')
call mkdir(s:plugdir . '/ftdetect', 'p') call mkdir(s:plugdir . '/ftdetect', 'p')
call mkdir(s:plugdir . '/after', 'p') call mkdir(s:plugdir . '/after', 'p')
set rtp& set rtp&
@@ -38,6 +38,10 @@ describe('packadd', function()
call setline(1, 'let g:plugin_works = 42') call setline(1, 'let g:plugin_works = 42')
wq wq
exe 'split ' . s:plugdir . '/plugin/also/loaded.vim'
call setline(1, 'let g:plugin_also_works = 77')
wq
exe 'split ' . s:plugdir . '/ftdetect/test.vim' exe 'split ' . s:plugdir . '/ftdetect/test.vim'
call setline(1, 'let g:ftdetect_works = 17') call setline(1, 'let g:ftdetect_works = 17')
wq wq
@@ -45,6 +49,7 @@ describe('packadd', function()
packadd mytest packadd mytest
call assert_true(42, g:plugin_works) call assert_true(42, g:plugin_works)
call assert_equal(77, g:plugin_also_works)
call assert_true(17, g:ftdetect_works) call assert_true(17, g:ftdetect_works)
call assert_true(len(&rtp) > len(rtp)) call assert_true(len(&rtp) > len(rtp))
call assert_true(&rtp =~ (s:plugdir . '\($\|,\)')) call assert_true(&rtp =~ (s:plugdir . '\($\|,\)'))