diff options
-rw-r--r-- | complete.cpp | 3 | ||||
-rw-r--r-- | parser.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/complete.cpp b/complete.cpp index ea83af2b..fd51b226 100644 --- a/complete.cpp +++ b/complete.cpp @@ -1163,8 +1163,7 @@ void completer_t::complete_from_args( const wcstring &str, std::vector<completion_t> possible_comp; bool is_autosuggest = (this->type == COMPLETE_AUTOSUGGEST); - bool show_errors = ! is_autosuggest; - parser_t parser(PARSER_TYPE_COMPLETIONS_ONLY, show_errors); + parser_t parser(is_autosuggest ? PARSER_TYPE_COMPLETIONS_ONLY : PARSER_TYPE_GENERAL, false); /* If type is COMPLETE_AUTOSUGGEST, it means we're on a background thread, so don't call proc_push_interactive */ if (! is_autosuggest) @@ -767,8 +767,7 @@ int parser_t::eval_args( const wchar_t *line, std::vector<completion_t> &args ) expand_flags_t eflags = 0; if (! show_errors) eflags |= EXPAND_NO_DESCRIPTIONS; - // Completions need command substitution (for example, the cd completion uses this) - if (this->parser_type != PARSER_TYPE_GENERAL && this->parser_type != PARSER_TYPE_COMPLETIONS_ONLY) + if (this->parser_type != PARSER_TYPE_GENERAL) eflags |= EXPAND_SKIP_CMDSUBST; /* |