patch 7.4.2164
Problem: It is not possible to use plugins in an "after" directory to tune
the behavior of a package.
Solution: First load plugins from non-after directories, then packages and
finally plugins in after directories.
Reset 'loadplugins' before executing --cmd arguments.
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 2cebbeb..0e332dd 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -3240,15 +3240,30 @@
rtp = rtp_copy;
while (*rtp != NUL && ((flags & DIP_ALL) || !did_one))
{
+ size_t buflen;
+
/* Copy the path from 'runtimepath' to buf[]. */
copy_option_part(&rtp, buf, MAXPATHL, ",");
+ buflen = STRLEN(buf);
+
+ /* Skip after or non-after directories. */
+ if (flags & (DIP_NOAFTER | DIP_AFTER))
+ {
+ int is_after = buflen >= 5
+ && STRCMP(buf + buflen - 5, "after") == 0;
+
+ if ((is_after && (flags & DIP_NOAFTER))
+ || (!is_after && (flags & DIP_AFTER)))
+ continue;
+ }
+
if (name == NULL)
{
(*callback)(buf, (void *) &cookie);
if (!did_one)
did_one = (cookie == NULL);
}
- else if (STRLEN(buf) + STRLEN(name) + 2 < MAXPATHL)
+ else if (buflen + STRLEN(name) + 2 < MAXPATHL)
{
add_pathsep(buf);
tail = buf + STRLEN(buf);
@@ -3512,6 +3527,7 @@
/*
* ":packloadall"
* Find plugins in the package directories and source them.
+ * "eap" is NULL when invoked during startup.
*/
void
ex_packloadall(exarg_T *eap)
diff --git a/src/main.c b/src/main.c
index 51e4483..48e90c2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -439,6 +439,11 @@
#endif
#ifndef NO_VIM_MAIN
+ /* Reset 'loadplugins' for "-u NONE" before "--cmd" arguments.
+ * Allows for setting 'loadplugins' there. */
+ if (params.use_vimrc != NULL && STRCMP(params.use_vimrc, "NONE") == 0)
+ p_lpl = FALSE;
+
/* Execute --cmd arguments. */
exe_pre_commands(¶ms);
@@ -453,14 +458,22 @@
if (p_lpl)
{
# ifdef VMS /* Somehow VMS doesn't handle the "**". */
- source_runtime((char_u *)"plugin/*.vim", DIP_ALL);
+ source_runtime((char_u *)"plugin/*.vim", DIP_ALL | DIP_NOAFTER);
# else
- source_runtime((char_u *)"plugin/**/*.vim", DIP_ALL);
+ source_runtime((char_u *)"plugin/**/*.vim", DIP_ALL | DIP_NOAFTER);
# endif
TIME_MSG("loading plugins");
ex_packloadall(NULL);
TIME_MSG("loading packages");
+
+# ifdef VMS /* Somehow VMS doesn't handle the "**". */
+ source_runtime((char_u *)"plugin/*.vim", DIP_ALL | DIP_AFTER);
+# else
+ source_runtime((char_u *)"plugin/**/*.vim", DIP_ALL | DIP_AFTER);
+# endif
+ TIME_MSG("loading after plugins");
+
}
#endif
@@ -2945,8 +2958,6 @@
if (use_gvimrc == NULL) /* don't load gvimrc either */
use_gvimrc = parmp->use_vimrc;
#endif
- if (parmp->use_vimrc[2] == 'N')
- p_lpl = FALSE; /* don't load plugins either */
}
else
{
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 5c629ed..2153039 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -127,4 +127,6 @@
.vim.res:
- $(RUN_VIMTEST) -u NONE -U NONE -S runtest.vim $*.vim
+ @echo "$(RUN_VIMTEST)" > vimcmd
+ $(RUN_VIMTEST) -U NONE -S runtest.vim $*.vim
+ @rm vimcmd
diff --git a/src/testdir/setup.vim b/src/testdir/setup.vim
index f7e475a..dee3de2 100644
--- a/src/testdir/setup.vim
+++ b/src/testdir/setup.vim
@@ -1,7 +1,8 @@
" Common preparations for running tests.
-" Make sure 'runtimepath' does not include $HOME.
+" Make sure 'runtimepath' and 'packpath' does not include $HOME.
set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
+let &packpath = &rtp
" Only when the +eval feature is present.
if 1
diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index b28a26c..d0be241 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -120,3 +120,24 @@
sleep 10m
endfor
endfunc
+
+" Run Vim, using the "vimcmd" file and "-u NORC".
+" "before" is a list of commands to be executed before loading plugins.
+" "after" is a list of commands to be executed after loading plugins.
+" Plugins are not loaded, unless 'loadplugins' is set in "before".
+" Return 1 if Vim could be executed.
+func RunVim(before, after)
+ if !filereadable('vimcmd')
+ return 0
+ endif
+ call writefile(a:before, 'Xbefore.vim')
+ call writefile(a:after, 'Xafter.vim')
+
+ let cmd = readfile('vimcmd')[0]
+ let cmd = substitute(cmd, '-u \f\+', '-u NONE', '')
+ exe "silent !" . cmd . " --cmd 'so Xbefore.vim' -S Xafter.vim"
+
+ call delete('Xbefore.vim')
+ call delete('Xafter.vim')
+ return 1
+endfunc
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 0630b2a..26e7b9f 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -1,8 +1,56 @@
-" Check that loading startup.vim works.
+" Tests for startup.
+source shared.vim
+
+" Check that loading startup.vim works.
func Test_startup_script()
set compatible
source $VIMRUNTIME/defaults.vim
call assert_equal(0, &compatible)
endfunc
+
+" Verify the order in which plugins are loaded:
+" 1. plugins in non-after directories
+" 2. packages
+" 3. plugins in after directories
+func Test_after_comes_later()
+ let before = [
+ \ 'let $HOME = "/does/not/exist"',
+ \ 'set loadplugins',
+ \ 'set rtp=Xhere,Xafter',
+ \ 'set packpath=Xhere,Xafter',
+ \ 'set nomore',
+ \ ]
+ let after = [
+ \ 'redir! > Xtestout',
+ \ 'scriptnames',
+ \ 'redir END',
+ \ 'quit',
+ \ ]
+ call mkdir('Xhere/plugin', 'p')
+ call writefile(['let done = 1'], 'Xhere/plugin/here.vim')
+ call mkdir('Xhere/pack/foo/start/foobar/plugin', 'p')
+ call writefile(['let done = 1'], 'Xhere/pack/foo/start/foobar/plugin/foo.vim')
+
+ call mkdir('Xafter/plugin', 'p')
+ call writefile(['let done = 1'], 'Xafter/plugin/later.vim')
+
+ call RunVim(before, after)
+
+ let lines = readfile('Xtestout')
+ let expected = ['Xbefore.vim', 'here.vim', 'foo.vim', 'later.vim', 'Xafter.vim']
+ let found = []
+ for line in lines
+ for one in expected
+ if line =~ one
+ call add(found, one)
+ endif
+ endfor
+ endfor
+ call assert_equal(expected, found)
+
+ call delete('Xtestout')
+ call delete('Xhere', 'rf')
+ call delete('Xafter', 'rf')
+endfunc
diff --git a/src/version.c b/src/version.c
index e648862..142801d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2164,
+/**/
2163,
/**/
2162,
diff --git a/src/vim.h b/src/vim.h
index 398fcc5..928a558 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2451,6 +2451,8 @@
#define DIP_START 0x08 /* also use "start" directory in 'packpath' */
#define DIP_OPT 0x10 /* also use "opt" directory in 'packpath' */
#define DIP_NORTP 0x20 /* do not use 'runtimepath' */
+#define DIP_NOAFTER 0x40 /* skip "after" directories */
+#define DIP_AFTER 0x80 /* only use "after" directories */
/* Lowest number used for window ID. Cannot have this many windows. */
#define LOWEST_WIN_ID 1000