Merge branch 'master' into ast

This commit is contained in:
ridiculousfish
2014-01-01 15:32:50 -08:00
8 changed files with 130 additions and 5 deletions

View File

@@ -1241,7 +1241,7 @@ void completer_t::complete_from_args(const wcstring &str,
if (! is_autosuggest)
proc_pop_interactive();
this->complete_strings(str, desc.c_str(), 0, possible_comp, flags);
this->complete_strings(escape_string(str, ESCAPE_ALL), desc.c_str(), 0, possible_comp, flags);
}
/**