aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-06-20 10:35:38 -0400
committerJames McCoy <jamessan@jamessan.com>2016-07-08 01:43:36 -0400
commit1f54d253e169fbc483cc485f9b3092a8da1f62db (patch)
tree5fd003df9982fbe847567106fadbc183c0bc569c
parent4ca9e13637d9acfa9660103949062a2d5d9f5bde (diff)
downloadrneovim-1f54d253e169fbc483cc485f9b3092a8da1f62db.tar.gz
rneovim-1f54d253e169fbc483cc485f9b3092a8da1f62db.tar.bz2
rneovim-1f54d253e169fbc483cc485f9b3092a8da1f62db.zip
vim-patch:7.4.1528
Problem: Using "ever" for packages is confusing. Solution: Use "start", as it's related to startup. https://github.com/vim/vim/commit/af1a0e371e739f8dff337fd31da0ff8ffb347b43
-rw-r--r--runtime/doc/repeat.txt22
-rw-r--r--src/nvim/ex_cmds2.c4
-rw-r--r--src/nvim/version.c2
3 files changed, 14 insertions, 14 deletions
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index ea86be5bf7..8fcecfd5c0 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
@@ -426,16 +426,16 @@ The directory name "foo" is arbitrary, you can pick anything you like.
You would now have these files under ~/.local/share/nvim/site:
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
-"~/.local/share/nvim/site/pack/foo/ever/foobar" to 'runtimepath'.
+In the example Vim will find "pack/foo/start/foobar/plugin/foo.vim" and adds
+"~/.local/share/nvim/site/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'.
@@ -443,7 +443,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
@@ -454,13 +454,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 ~/.local/share/nvim/site/pack/foo/ever/foobar
- % cd ~/.local/share/nvim/site/pack/foo/ever/foobar
+ % mkdir -p ~/.local/share/nvim/site/pack/foo/start/foobar
+ % cd ~/.local/share/nvim/site/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/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index 8e88a55d41..3f211d7ab8 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -2430,7 +2430,7 @@ static void add_pack_plugin(char_u *fname, void *cookie)
}
// now we have:
- // rtp/pack/name/ever/name
+ // rtp/pack/name/start/name
// p4 p3 p2 p1
//
// find the part up to "pack" in 'runtimepath'
@@ -2499,7 +2499,7 @@ theend:
// Find plugins in the package directories and source them.
void source_packages(void)
{
- 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/nvim/version.c b/src/nvim/version.c
index 6f5ebb751d..9fcc811f7a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -167,7 +167,7 @@ static int included_patches[] = {
// 1531 NA
// 1530 NA
// 1529 NA
- // 1528,
+ 1528,
// 1527 NA
// 1526 NA
// 1525 NA