diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-11-27 19:01:31 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-11-27 19:01:31 +0100 |
| commit | 6ee874d378829b62e0944063a9a029e81b5debfb (patch) | |
| tree | fc64478cbda5c25c4d60f3f30802b53e1714fcef /src/main.c | |
| parent | 3482be6a33c3a00fe1e8e604310ad3034f593045 (diff) | |
patch 8.2.2059: Amiga: can't find pluginsv8.2.2059
Problem: Amiga: can't find plugins.
Solution: Do not use "**" in the pattern. (Ola Söder, closes #7384)
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/main.c b/src/main.c index 53b871977e..e3ce9e4a60 100644 --- a/src/main.c +++ b/src/main.c @@ -432,6 +432,13 @@ vim_main2(void) if (p_lpl) { 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 // autoload directories can be found. Only if not done already with a @@ -444,12 +451,7 @@ vim_main2(void) add_pack_start_dirs(); } - source_in_path(rtp_copy == NULL ? p_rtp : rtp_copy, -# ifdef VMS // Somehow VMS doesn't handle the "**". - (char_u *)"plugin/*.vim", -# else - (char_u *)"plugin/**/*.vim", -# endif + source_in_path(rtp_copy == NULL ? p_rtp : rtp_copy, plugin_pattern, DIP_ALL | DIP_NOAFTER, NULL); TIME_MSG("loading plugins"); vim_free(rtp_copy); @@ -460,13 +462,8 @@ vim_main2(void) load_start_packages(); TIME_MSG("loading packages"); -# ifdef VMS // Somehow VMS doesn't handle the "**". - source_runtime((char_u *)"plugin/*.vim", DIP_ALL | DIP_AFTER); -# else - source_runtime((char_u *)"plugin/**/*.vim", DIP_ALL | DIP_AFTER); -# endif + source_runtime(plugin_pattern, DIP_ALL | DIP_AFTER); TIME_MSG("loading after plugins"); - } #endif |