Skip to content

Commit

Permalink
patch 9.1.0761: :cd completion fails on Windows with backslash in path
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
chrisbra committed Oct 6, 2024
1 parent d4ad4c9 commit 1a31c43
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/fileio.c
Original file line number Diff line number Diff line change
Expand Up @@ -5570,6 +5570,8 @@ match_file_list(char_u *list, char_u *sfname, char_u *ffname)
* allow_dirs, otherwise FALSE is put there -- webb.
* 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.
*/
char_u *
Expand Down
2 changes: 1 addition & 1 deletion src/findfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -2362,7 +2362,7 @@ uniquefy_paths(
file_pattern[0] = '*';
file_pattern[1] = NUL;
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);
if (pat == NULL)
return;
Expand Down
11 changes: 11 additions & 0 deletions src/testdir/test_cmdline.vim
Original file line number Diff line number Diff line change
Expand Up @@ -3920,4 +3920,15 @@ func Test_ex_command_completion()
set cpo-=*
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
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
761,
/**/
760,
/**/
Expand Down

0 comments on commit 1a31c43

Please sign in to comment.