mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2898_homedir_completion' 

* 2898_homedir_completion:
  Ticket #2898: fix broken path completion on paths starting with ~/.
This commit is contained in:
Andrew Borodin 2012-09-27 14:25:40 +04:00
parent 3190504ed6 f3cc7de694
commit 6dedc67427
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/widget/input_complete.c
View File

@ -120,7 +120,7 @@ show_c_flags (input_complete_t flags)
static char *
filename_completion_function (const char *text, int state, input_complete_t flags)
{
static DIR *directory;
static DIR *directory = NULL;
static char *filename = NULL;
static char *dirname = NULL;
static char *users_dirname = NULL;
@ -169,7 +169,6 @@ filename_completion_function (const char *text, int state, input_complete_t flag
dirname = g_strdup (".");
filename = g_strdup (text);
}
dirname_vpath = vfs_path_from_str (dirname);
/* We aren't done yet. We also support the "~user" syntax. */
@ -177,6 +176,7 @@ filename_completion_function (const char *text, int state, input_complete_t flag
users_dirname = dirname;
dirname = tilde_expand (dirname);
canonicalize_pathname (dirname);
dirname_vpath = vfs_path_from_str (dirname);
/* Here we should do something with variable expansion
and `command`.