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)
diff --git a/src/main.c b/src/main.c
index 53b8719..e3ce9e4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -432,6 +432,13 @@
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 @@
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 @@
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