aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.2.410

Browse Source 
Problem:    Highlighting directories for completion doesn't work properly.
Solution:   Don't halve backslashes when not needed, expaned "~/".
            (Dominique Pelle)
This commit is contained in:
Bram Moolenaar 2010-03-23 18:06:52 +01:00
parent d25bc23870
commit 63fa526b50
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ex_getln.c
View File

@ -3948,12 +3948,26 @@ showmatches(xp, wildmenu)
|| xp->xp_context == EXPAND_SHELLCMD || xp->xp_context == EXPAND_SHELLCMD
|| xp->xp_context == EXPAND_BUFFERS) || xp->xp_context == EXPAND_BUFFERS)
{ {
char_u *halved_slash;
/* highlight directories */ /* highlight directories */
halved_slash = backslash_halve_save(files_found[k]); if (xp->xp_numfiles != -1)
j = mch_isdir(halved_slash); {
char_u *halved_slash;
char_u *exp_path;
/* Expansion was done before and special characters
* were escaped, need to halve backslashes. Also
* $HOME has been replaced with ~/. */
exp_path = expand_env_save_opt(files_found[k], TRUE);
halved_slash = backslash_halve_save(
exp_path != NULL ? exp_path : files_found[k]);
j = mch_isdir(halved_slash != NULL ? halved_slash
: files_found[k]);
vim_free(exp_path);
vim_free(halved_slash); vim_free(halved_slash);
}
else
/* Expansion was done here, file names are literal. */
j = mch_isdir(files_found[k]);
if (showtail) if (showtail)
p = L_SHOWFILE(k); p = L_SHOWFILE(k);
else else

2
src/version.c
View File

@ -681,6 +681,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 */
/**/
410,
/**/ /**/
409, 409,
/**/ /**/