Skip to content

Commit af1a0e3

Browse files
committed
patch 7.4.1528
Problem: Using "ever" for packages is confusing. Solution: Use "start", as it's related to startup.
1 parent 562ca71 commit af1a0e3

3 files changed

Lines changed: 16 additions & 14 deletions

File tree

runtime/doc/repeat.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*repeat.txt* For Vim version 7.4. Last change: 2016 Mar 07
1+
*repeat.txt* For Vim version 7.4. Last change: 2016 Mar 09
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -441,24 +441,24 @@ The directory name "foo" is arbitrary, you can pick anything you like.
441441

442442
You would now have these files under ~/.vim:
443443
pack/foo/README.txt
444-
pack/foo/ever/foobar/plugin/foo.vim
445-
pack/foo/ever/foobar/syntax/some.vim
444+
pack/foo/start/foobar/plugin/foo.vim
445+
pack/foo/start/foobar/syntax/some.vim
446446
pack/foo/opt/foodebug/plugin/debugger.vim
447447

448448
When Vim starts up, after processing your .vimrc, it scans all directories in
449-
'packpath' for plugins under the "pack/*/ever" directory and loads them. The
449+
'packpath' for plugins under the "pack/*/start" directory and loads them. The
450450
directory is added to 'runtimepath'.
451451

452-
In the example Vim will find "pack/foo/ever/foobar/plugin/foo.vim" and adds
453-
"~/.vim/pack/foo/ever/foobar" to 'runtimepath'.
452+
In the example Vim will find "pack/foo/start/foobar/plugin/foo.vim" and adds
453+
"~/.vim/pack/foo/start/foobar" to 'runtimepath'.
454454

455455
If the "foobar" plugin kicks in and sets the 'filetype' to "some", Vim will
456456
find the syntax/some.vim file, because its directory is in 'runtimepath'.
457457

458458
Vim will also load ftdetect files, if there are any.
459459

460460
Note that the files under "pack/foo/opt" or not loaded automatically, only the
461-
ones under "pack/foo/ever". See |pack-add| below for how the "opt" directory
461+
ones under "pack/foo/start". See |pack-add| below for how the "opt" directory
462462
is used.
463463

464464
Loading packages will not happen if loading plugins is disabled, see
@@ -469,13 +469,13 @@ Using a single plugin and loading it automatically ~
469469

470470
If you don't have a package but a single plugin, you need to create the extra
471471
directory level:
472-
% mkdir -p ~/.vim/pack/foo/ever/foobar
473-
% cd ~/.vim/pack/foo/ever/foobar
472+
% mkdir -p ~/.vim/pack/foo/start/foobar
473+
% cd ~/.vim/pack/foo/start/foobar
474474
% unzip /tmp/someplugin.zip
475475

476476
You would now have these files:
477-
pack/foo/ever/foobar/plugin/foo.vim
478-
pack/foo/ever/foobar/syntax/some.vim
477+
pack/foo/start/foobar/plugin/foo.vim
478+
pack/foo/start/foobar/syntax/some.vim
479479

480480
From here it works like above.
481481

src/ex_cmds2.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3118,8 +3118,8 @@ add_pack_plugin(char_u *fname, void *cookie)
31183118
}
31193119

31203120
/* now we have:
3121-
* rtp/pack/name/ever/name
3122-
* p4 p3 p2 p1
3121+
* rtp/pack/name/start/name
3122+
* p4 p3 p2 p1
31233123
*
31243124
* find the part up to "pack" in 'runtimepath' */
31253125
c = *p4;
@@ -3195,7 +3195,7 @@ add_pack_plugin(char_u *fname, void *cookie)
31953195
void
31963196
source_packages()
31973197
{
3198-
do_in_path(p_pp, (char_u *)"pack/*/ever/*", DIP_ALL + DIP_DIR,
3198+
do_in_path(p_pp, (char_u *)"pack/*/start/*", DIP_ALL + DIP_DIR,
31993199
add_pack_plugin, p_pp);
32003200
}
32013201

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,8 @@ static char *(features[]) =
743743

744744
static int included_patches[] =
745745
{ /* Add new patch number below this line */
746+
/**/
747+
1528,
746748
/**/
747749
1527,
748750
/**/

0 commit comments

Comments
 (0)