diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2013-11-29 13:31:18 -0800 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-11-29 13:34:03 -0800 |
| commit | 4aaa9e7d9fd08ad3129b3b7ed0c82f368611ea6f (patch) | |
| tree | 656c404859b120f80e4f06b52343e14f34042950 /highlight.cpp | |
| parent | e1608362d0d1da493153e6884486ce82deab27dd (diff) | |
Allow autosuggestions to do job expansion. Fixes
Diffstat (limited to 'highlight.cpp')
| -rw-r--r-- | highlight.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/highlight.cpp b/highlight.cpp index 2e154387..fd7aa481 100644 --- a/highlight.cpp +++ b/highlight.cpp @@ -873,7 +873,7 @@ bool autosuggest_validate_from_history(const history_item_t &item, file_detectio { /* We can possibly handle this specially */ wcstring dir = parsed_arguments.back(); - if (expand_one(dir, EXPAND_SKIP_CMDSUBST | EXPAND_SKIP_JOBS)) + if (expand_one(dir, EXPAND_SKIP_CMDSUBST)) { handled = true; bool is_help = string_prefixes_string(dir, L"--help") || string_prefixes_string(dir, L"-h"); @@ -997,7 +997,7 @@ static void tokenize(const wchar_t * const buff, std::vector<int> &color, const if (cmd == L"cd") { wcstring dir = tok_last(&tok); - if (expand_one(dir, EXPAND_SKIP_CMDSUBST | EXPAND_SKIP_JOBS)) + if (expand_one(dir, EXPAND_SKIP_CMDSUBST)) { int is_help = string_prefixes_string(dir, L"--help") || string_prefixes_string(dir, L"-h"); if (!is_help && ! is_potential_cd_path(dir, working_directory, PATH_EXPAND_TILDE, NULL)) @@ -1182,7 +1182,7 @@ static void tokenize(const wchar_t * const buff, std::vector<int> &color, const case TOK_STRING: { target_str = tok_last(&tok); - if (expand_one(target_str, EXPAND_SKIP_CMDSUBST | EXPAND_SKIP_JOBS)) + if (expand_one(target_str, EXPAND_SKIP_CMDSUBST)) { target = target_str.c_str(); } |