Patch 8.2.2059

[Bram Moolenaar]

Patch 8.2.2059
Problem: Amiga: can't find plugins.
Solution: Do not use "**" in the pattern. (Ola Söder, closes #7384)
Files: src/main.c


*** ../vim-8.2.2058/src/main.c 2020-10-11 14:58:42.616838449 +0200
--- src/main.c 2020-11-27 18:57:32.357811725 +0100
***************
*** 432,437 ****
--- 432,444 ----
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,455 ****
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
DIP_ALL | DIP_NOAFTER, NULL);
TIME_MSG("loading plugins");
vim_free(rtp_copy);
--- 451,457 ----
add_pack_start_dirs();
}

! 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,472 ****
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
TIME_MSG("loading after plugins");
-
}
#endif

--- 462,469 ----
load_start_packages();
TIME_MSG("loading packages");

! source_runtime(plugin_pattern, DIP_ALL | DIP_AFTER);
TIME_MSG("loading after plugins");
}
#endif

*** ../vim-8.2.2058/src/version.c 2020-11-27 11:00:34.994467828 +0100
--- src/version.c 2020-11-27 18:58:24.541603959 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2059,
/**/

--
ARTHUR: I did say sorry about the `old woman,' but from the behind you
looked--
DENNIS: What I object to is you automatically treat me like an inferior!
ARTHUR: Well, I AM king...
The Quest for the Holy Grail (Monty Python)

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///