mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.0.0876: backslashes and wildcards in backticks don't work
Problem: MS-Windows: Backslashes and wildcards in backticks don't work. Solution: Do not handle backslashes inside backticks in the wrong place. (Yasuhiro Matsumoto, closes #1942)
This commit is contained in:
@@ -450,6 +450,15 @@ slash_adjust(char_u *p)
|
|||||||
{
|
{
|
||||||
if (path_with_url(p))
|
if (path_with_url(p))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (*p == '`')
|
||||||
|
{
|
||||||
|
/* don't replace backslash in backtick quoted strings */
|
||||||
|
int len = STRLEN(p);
|
||||||
|
if (len > 2 && *(p + len - 1) == '`')
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
while (*p)
|
while (*p)
|
||||||
{
|
{
|
||||||
if (*p == psepcN)
|
if (*p == psepcN)
|
||||||
|
@@ -7004,6 +7004,8 @@ fix_arg_enc(void)
|
|||||||
str = utf16_to_enc(ArglistW[idx], NULL);
|
str = utf16_to_enc(ArglistW[idx], NULL);
|
||||||
if (str != NULL)
|
if (str != NULL)
|
||||||
{
|
{
|
||||||
|
int literal = used_file_literal;
|
||||||
|
|
||||||
#ifdef FEAT_DIFF
|
#ifdef FEAT_DIFF
|
||||||
/* When using diff mode may need to concatenate file name to
|
/* When using diff mode may need to concatenate file name to
|
||||||
* directory name. Just like it's done in main(). */
|
* directory name. Just like it's done in main(). */
|
||||||
@@ -7025,7 +7027,15 @@ fix_arg_enc(void)
|
|||||||
if (used_file_literal)
|
if (used_file_literal)
|
||||||
buf_set_name(fnum_list[i], str);
|
buf_set_name(fnum_list[i], str);
|
||||||
|
|
||||||
alist_add(&global_alist, str, used_file_literal ? 2 : 0);
|
/* Check backtick literal. backtick literal is already expanded in
|
||||||
|
* main.c, so this part add str as literal. */
|
||||||
|
if (literal == FALSE)
|
||||||
|
{
|
||||||
|
int len = STRLEN(str);
|
||||||
|
if (len > 2 && *str == '`' && *(str + len - 1) == '`')
|
||||||
|
literal = TRUE;
|
||||||
|
}
|
||||||
|
alist_add(&global_alist, str, literal ? 2 : 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -769,6 +769,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 */
|
||||||
|
/**/
|
||||||
|
876,
|
||||||
/**/
|
/**/
|
||||||
875,
|
875,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user