mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 9.1.0761: :cd completion fails on Windows with backslash in path
Problem: :cd completion fails on Windows with backslash in path Solution: switch no_bslash argument to FALSE in file_pat_to_reg_pat() Note: only fixes the problem on Windows. For Unix, we still need to escape backslashes since those are taken as regex atoms (and could be invalid regex atoms). fixes: #15643 closes: #15808 Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
parent
d4ad4c9b3e
commit
1a31c430bb
@ -5570,6 +5570,8 @@ match_file_list(char_u *list, char_u *sfname, char_u *ffname)
|
|||||||
* allow_dirs, otherwise FALSE is put there -- webb.
|
* allow_dirs, otherwise FALSE is put there -- webb.
|
||||||
* Handle backslashes before special characters, like "\*" and "\ ".
|
* Handle backslashes before special characters, like "\*" and "\ ".
|
||||||
*
|
*
|
||||||
|
* no_bslash only makes a difference, when BACKSLASH_IN_FILENAME is defined
|
||||||
|
*
|
||||||
* Returns NULL when out of memory.
|
* Returns NULL when out of memory.
|
||||||
*/
|
*/
|
||||||
char_u *
|
char_u *
|
||||||
|
@ -2362,7 +2362,7 @@ uniquefy_paths(
|
|||||||
file_pattern[0] = '*';
|
file_pattern[0] = '*';
|
||||||
file_pattern[1] = NUL;
|
file_pattern[1] = NUL;
|
||||||
STRCAT(file_pattern, pattern);
|
STRCAT(file_pattern, pattern);
|
||||||
pat = file_pat_to_reg_pat(file_pattern, NULL, NULL, TRUE);
|
pat = file_pat_to_reg_pat(file_pattern, NULL, NULL, FALSE);
|
||||||
vim_free(file_pattern);
|
vim_free(file_pattern);
|
||||||
if (pat == NULL)
|
if (pat == NULL)
|
||||||
return;
|
return;
|
||||||
|
@ -3920,4 +3920,15 @@ func Test_ex_command_completion()
|
|||||||
set cpo-=*
|
set cpo-=*
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_cd_bslsh_completion_windows()
|
||||||
|
CheckMSWindows
|
||||||
|
let save_shellslash = &shellslash
|
||||||
|
set noshellslash
|
||||||
|
call system('mkdir XXXa\_b')
|
||||||
|
defer delete('XXXa', 'rf')
|
||||||
|
call feedkeys(":cd XXXa\\_b\<C-A>\<C-B>\"\<CR>", 'tx')
|
||||||
|
call assert_equal('"cd XXXa\_b\', @:)
|
||||||
|
let &shellslash = save_shellslash
|
||||||
|
endfunc
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
@ -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 */
|
||||||
|
/**/
|
||||||
|
761,
|
||||||
/**/
|
/**/
|
||||||
760,
|
760,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user