1
0
forked from aniani/vim

patch 9.1.0924: patch 9.1.0923 causes issues

Problem:  patch 9.1.0923 causes issues (Shane-XB-Qian)
Solution: back-out the change

This reverts commit e29c8bafa7 (v9.1.0923)

fixes: #16213
related: #16160

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2024-12-13 17:54:33 +01:00
parent e29c8bafa7
commit 6cc3027e54
4 changed files with 406 additions and 337 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -6796,6 +6796,21 @@ select_eintr:
return result; return result;
} }
/*
* Expand a path into all matching files and/or directories. Handles "*",
* "?", "[a-z]", "**", etc.
* "path" has backslashes before chars that are not to be expanded.
* Returns the number of matches found.
*/
int
mch_expandpath(
garray_T *gap,
char_u *path,
int flags) // EW_* flags
{
return unix_expandpath(gap, path, 0, flags, FALSE);
}
/* /*
* mch_expand_wildcards() - this code does wild-card pattern matching using * mch_expand_wildcards() - this code does wild-card pattern matching using
* the shell * the shell

View File

@@ -56,7 +56,6 @@ int expand_wildcards_eval(char_u **pat, int *num_file, char_u ***file, int flags
int expand_wildcards(int num_pat, char_u **pat, int *num_files, char_u ***files, int flags); int expand_wildcards(int num_pat, char_u **pat, int *num_files, char_u ***files, int flags);
int match_suffix(char_u *fname); int match_suffix(char_u *fname);
int unix_expandpath(garray_T *gap, char_u *path, int wildoff, int flags, int didstar); int unix_expandpath(garray_T *gap, char_u *path, int wildoff, int flags, int didstar);
int mch_expandpath(garray_T *gap, char_u *path, int flags);
int gen_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file, int flags); int gen_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file, int flags);
void addfile(garray_T *gap, char_u *f, int flags); void addfile(garray_T *gap, char_u *f, int flags);
void FreeWild(int count, char_u **files); void FreeWild(int count, char_u **files);

View File

@@ -704,6 +704,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 */
/**/
924,
/**/ /**/
923, 923,
/**/ /**/