changeset 8475:aec051e61547 v7.4.1528

commit https://github.com/vim/vim/commit/af1a0e371e739f8dff337fd31da0ff8ffb347b43 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Mar 9 22:19:26 2016 +0100 patch 7.4.1528 Problem: Using "ever" for packages is confusing. Solution: Use "start", as it's related to startup.
author Christian Brabandt <cb@256bit.org>
date Wed, 09 Mar 2016 22:30:07 +0100
parents d69a804ff41a
children 81ddc32fa492
files runtime/doc/repeat.txt src/ex_cmds2.c src/version.c
diffstat 3 files changed, 16 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- 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, y
 
 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 i
 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 aut
 
 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.
 
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -3118,8 +3118,8 @@ add_pack_plugin(char_u *fname, void *coo
 	    }
 
 	/* 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);
 }
 
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1528,
+/**/
     1527,
 /**/
     1526,