diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2015-08-03 16:36:10 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2015-08-08 13:55:50 -0700 |
| commit | 602e9cebd9b3d8feb80c338d80bce570077239ba (patch) | |
| tree | 1aeb0779d9aab086c891f822117abf7ad64b4fc9 /src/complete.cpp | |
| parent | d2049edcab6b2046b7e3e01b4a48f2e13f2aa878 (diff) | |
rename FOR_COMPLETIONS to EXPAND_FOR_COMPLETIONS
This is yet clearer
Diffstat (limited to 'src/complete.cpp')
| -rw-r--r-- | src/complete.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/complete.cpp b/src/complete.cpp index 2e4d69ce..ed30776d 100644 --- a/src/complete.cpp +++ b/src/complete.cpp @@ -1140,7 +1140,7 @@ void completer_t::complete_cmd(const wcstring &str_cmd, bool use_function, bool if (use_command) { - if (expand_string(str_cmd, &this->completions, FOR_COMPLETIONS | EXECUTABLES_ONLY | this->expand_flags(), NULL) != EXPAND_ERROR) + if (expand_string(str_cmd, &this->completions, EXPAND_FOR_COMPLETIONS | EXECUTABLES_ONLY | this->expand_flags(), NULL) != EXPAND_ERROR) { if (this->wants_descriptions()) { @@ -1150,7 +1150,7 @@ void completer_t::complete_cmd(const wcstring &str_cmd, bool use_function, bool } if (use_implicit_cd) { - if (!expand_string(str_cmd, &this->completions, FOR_COMPLETIONS | DIRECTORIES_ONLY | this->expand_flags(), NULL)) + if (!expand_string(str_cmd, &this->completions, EXPAND_FOR_COMPLETIONS | DIRECTORIES_ONLY | this->expand_flags(), NULL)) { // Not valid as implicit cd. } @@ -1180,7 +1180,7 @@ void completer_t::complete_cmd(const wcstring &str_cmd, bool use_function, bool size_t prev_count = this->completions.size(); if (expand_string(nxt_completion, &this->completions, - FOR_COMPLETIONS | EXECUTABLES_ONLY | this->expand_flags(), NULL) != EXPAND_ERROR) + EXPAND_FOR_COMPLETIONS | EXECUTABLES_ONLY | this->expand_flags(), NULL) != EXPAND_ERROR) { /* For all new completions, if COMPLETE_NO_CASE is set, then use only the last path component */ for (size_t i=prev_count; i< this->completions.size(); i++) @@ -1617,7 +1617,7 @@ bool completer_t::complete_param(const wcstring &scmd_orig, const wcstring &spop */ void completer_t::complete_param_expand(const wcstring &str, bool do_file, bool directories_only) { - expand_flags_t flags = EXPAND_SKIP_CMDSUBST | FOR_COMPLETIONS | this->expand_flags(); + expand_flags_t flags = EXPAND_SKIP_CMDSUBST | EXPAND_FOR_COMPLETIONS | this->expand_flags(); if (! do_file) flags |= EXPAND_SKIP_WILDCARDS; |