0
0
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00

patch 8.2.2059: Amiga: can't find plugins

Problem:    Amiga: can't find plugins.
Solution:   Do not use "**" in the pattern. (Ola Söder, closes #7384)
This commit is contained in:
Bram Moolenaar
2020-11-27 19:01:31 +01:00
parent 3482be6a33
commit 6ee874d378
2 changed files with 11 additions and 12 deletions

View File

@@ -432,6 +432,13 @@ vim_main2(void)
if (p_lpl) if (p_lpl)
{ {
char_u *rtp_copy = NULL; char_u *rtp_copy = NULL;
char_u *plugin_pattern = (char_u *)
# if defined(VMS) || defined(AMIGA) // VMS and Amiga don't handle the "**".
"plugin/*.vim"
# else
"plugin/**/*.vim"
# endif
;
// First add all package directories to 'runtimepath', so that their // First add all package directories to 'runtimepath', so that their
// autoload directories can be found. Only if not done already with a // autoload directories can be found. Only if not done already with a
@@ -444,12 +451,7 @@ vim_main2(void)
add_pack_start_dirs(); add_pack_start_dirs();
} }
source_in_path(rtp_copy == NULL ? p_rtp : rtp_copy, source_in_path(rtp_copy == NULL ? p_rtp : rtp_copy, plugin_pattern,
# ifdef VMS // Somehow VMS doesn't handle the "**".
(char_u *)"plugin/*.vim",
# else
(char_u *)"plugin/**/*.vim",
# endif
DIP_ALL | DIP_NOAFTER, NULL); DIP_ALL | DIP_NOAFTER, NULL);
TIME_MSG("loading plugins"); TIME_MSG("loading plugins");
vim_free(rtp_copy); vim_free(rtp_copy);
@@ -460,13 +462,8 @@ vim_main2(void)
load_start_packages(); load_start_packages();
TIME_MSG("loading packages"); TIME_MSG("loading packages");
# ifdef VMS // Somehow VMS doesn't handle the "**". source_runtime(plugin_pattern, DIP_ALL | DIP_AFTER);
source_runtime((char_u *)"plugin/*.vim", DIP_ALL | DIP_AFTER);
# else
source_runtime((char_u *)"plugin/**/*.vim", DIP_ALL | DIP_AFTER);
# endif
TIME_MSG("loading after plugins"); TIME_MSG("loading after plugins");
} }
#endif #endif

View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2059,
/**/ /**/
2058, 2058,
/**/ /**/