From af1a0e371e739f8dff337fd31da0ff8ffb347b43 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 9 Mar 2016 22:19:26 +0100 Subject: [PATCH] patch 7.4.1528 Problem: Using "ever" for packages is confusing. Solution: Use "start", as it's related to startup. --- runtime/doc/repeat.txt | 22 +++++++++++----------- src/ex_cmds2.c | 6 +++--- src/version.c | 2 ++ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt index 30be59cf4..28a17ae11 100644 --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1,4 +1,4 @@ -*repeat.txt* For Vim version 7.4. Last change: 2016 Mar 07 +*repeat.txt* For Vim version 7.4. Last change: 2016 Mar 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -441,16 +441,16 @@ The directory name "foo" is arbitrary, you can pick anything you like. You would now have these files under ~/.vim: pack/foo/README.txt - pack/foo/ever/foobar/plugin/foo.vim - pack/foo/ever/foobar/syntax/some.vim + pack/foo/start/foobar/plugin/foo.vim + pack/foo/start/foobar/syntax/some.vim pack/foo/opt/foodebug/plugin/debugger.vim When Vim starts up, after processing your .vimrc, it scans all directories in -'packpath' for plugins under the "pack/*/ever" directory and loads them. The +'packpath' for plugins under the "pack/*/start" directory and loads them. The directory is added to 'runtimepath'. -In the example Vim will find "pack/foo/ever/foobar/plugin/foo.vim" and adds -"~/.vim/pack/foo/ever/foobar" to 'runtimepath'. +In the example Vim will find "pack/foo/start/foobar/plugin/foo.vim" and adds +"~/.vim/pack/foo/start/foobar" to 'runtimepath'. If the "foobar" plugin kicks in and sets the 'filetype' to "some", Vim will find the syntax/some.vim file, because its directory is in 'runtimepath'. @@ -458,7 +458,7 @@ find the syntax/some.vim file, because its directory is in 'runtimepath'. Vim will also load ftdetect files, if there are any. Note that the files under "pack/foo/opt" or not loaded automatically, only the -ones under "pack/foo/ever". See |pack-add| below for how the "opt" directory +ones under "pack/foo/start". See |pack-add| below for how the "opt" directory is used. Loading packages will not happen if loading plugins is disabled, see @@ -469,13 +469,13 @@ Using a single plugin and loading it automatically ~ If you don't have a package but a single plugin, you need to create the extra directory level: - % mkdir -p ~/.vim/pack/foo/ever/foobar - % cd ~/.vim/pack/foo/ever/foobar + % mkdir -p ~/.vim/pack/foo/start/foobar + % cd ~/.vim/pack/foo/start/foobar % unzip /tmp/someplugin.zip You would now have these files: - pack/foo/ever/foobar/plugin/foo.vim - pack/foo/ever/foobar/syntax/some.vim + pack/foo/start/foobar/plugin/foo.vim + pack/foo/start/foobar/syntax/some.vim From here it works like above. diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 7a0d0bd94..19d7d19fa 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -3118,8 +3118,8 @@ add_pack_plugin(char_u *fname, void *cookie) } /* now we have: - * rtp/pack/name/ever/name - * p4 p3 p2 p1 + * rtp/pack/name/start/name + * p4 p3 p2 p1 * * find the part up to "pack" in 'runtimepath' */ c = *p4; @@ -3195,7 +3195,7 @@ theend: void source_packages() { - do_in_path(p_pp, (char_u *)"pack/*/ever/*", DIP_ALL + DIP_DIR, + do_in_path(p_pp, (char_u *)"pack/*/start/*", DIP_ALL + DIP_DIR, add_pack_plugin, p_pp); } diff --git a/src/version.c b/src/version.c index af4ebc07f..16855d491 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1528, /**/ 1527, /**/ -- 2.50.1