aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.0.0680: plugins in start packages are sourced twice

Browse Source 
Problem:    Plugins in start packages are sourced twice. (mseplowitz)
Solution:   Use the unmodified runtime path when loading plugins (test by Ingo
            Karkat, closes #1801)
This commit is contained in:
Bram Moolenaar
2017-06-27 14:43:55 +02:00
parent 41cc038ff8
commit 07ecfa64a1
5 changed files with 74 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.c
View File

@@ -449,18 +449,28 @@ vim_main2(void)
*/
if (p_lpl)
{
char_u *rtp_copy = NULL;
/* First add all package directories to 'runtimepath', so that their
* autoload directories can be found. Only if not done already with a
* :packloadall command. */
* :packloadall command.
* Make a copy of 'runtimepath', so that source_runtime does not use
* the pack directories. */
if (!did_source_packages)
{
rtp_copy = vim_strsave(p_rtp);
add_pack_start_dirs();
}
source_in_path(rtp_copy == NULL ? p_rtp : rtp_copy,
# ifdef VMS /* Somehow VMS doesn't handle the "**". */
source_runtime((char_u *)"plugin/*.vim", DIP_ALL | DIP_NOAFTER);
(char_u *)"plugin/*.vim",
# else
source_runtime((char_u *)"plugin/**/*.vim", DIP_ALL | DIP_NOAFTER);
(char_u *)"plugin/**/*.vim",
# endif
DIP_ALL | DIP_NOAFTER);
TIME_MSG("loading plugins");
vim_free(rtp_copy);
/* Only source "start" packages if not done already with a :packloadall
* command. */