diff options
| -rw-r--r-- | src/main.c | 21 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/main.c b/src/main.c index 53b871977..e3ce9e4a6 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 diff --git a/src/version.c b/src/version.c index 5bf2ef6d4..790cf5f2b 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2059, +/**/ 2058, /**/ 2057, |