Mercurial > vim
changeset 8823:6d92bbe6c7de v7.4.1699
commit https://github.com/vim/vim/commit/71fb0c146bef08dc276fc5793bd47366e6e0f32a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Apr 2 22:44:16 2016 +0200
patch 7.4.1699
Problem: :packadd does not work the same when used early or late.
Solution: Always load plugins matching "plugin/**/*.vim".
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 02 Apr 2016 22:45:05 +0200 |
| parents | b5390b726437 |
| children | 7b539c78d5e0 |
| files | src/ex_cmds2.c src/testdir/test_packadd.vim src/version.c |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -3376,7 +3376,7 @@ add_pack_plugin(char_u *fname, void *coo if (load_files) { - static char *plugpat = "%s/plugin/*.vim"; + static char *plugpat = "%s/plugin/**/*.vim"; static char *ftpat = "%s/ftdetect/*.vim"; int len; char_u *pat;
--- a/src/testdir/test_packadd.vim +++ b/src/testdir/test_packadd.vim @@ -11,7 +11,7 @@ func TearDown() endfunc func Test_packadd() - call mkdir(s:plugdir . '/plugin', 'p') + call mkdir(s:plugdir . '/plugin/also', 'p') call mkdir(s:plugdir . '/ftdetect', 'p') set rtp& let rtp = &rtp @@ -21,6 +21,10 @@ func Test_packadd() call setline(1, 'let g:plugin_works = 42') 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' call setline(1, 'let g:ftdetect_works = 17') wq @@ -28,6 +32,7 @@ func Test_packadd() packadd mytest call assert_equal(42, g:plugin_works) + call assert_equal(77, g:plugin_also_works) call assert_equal(17, g:ftdetect_works) call assert_true(len(&rtp) > len(rtp)) call assert_true(&rtp =~ 'testdir/Xdir/pack/mine/opt/mytest\($\|,\)')