aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 7.4.1699

Browse Source 
Problem:    :packadd does not work the same when used early or late.
Solution:   Always load plugins matching "plugin/**/*.vim".
This commit is contained in:
Bram Moolenaar
2016-04-02 22:44:16 +02:00
parent 298c65971e
commit 71fb0c146b
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ex_cmds2.c
View File

@@ -3376,7 +3376,7 @@ add_pack_plugin(char_u *fname, void *cookie)
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;

7
src/testdir/test_packadd.vim
View File

@@ -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\($\|,\)')

2
src/version.c
View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1699,
/**/
1698,
/**/