h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-07-02 09:11:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Rename expand_error_t to expand_result_t and make it class enum

Browse Source 
Also lowercase it all.
This commit is contained in:
ridiculousfish
2019-04-22 15:06:52 -07:00
parent b54c44f2f6
commit dcaac58f45
8 changed files with 95 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/highlight.cpp
View File

@@ -344,8 +344,8 @@ static bool plain_statement_get_expanded_command(const wcstring &src,
// Get the command. Try expanding it. If we cannot, it's an error.
maybe_t<wcstring> cmd = command_for_plain_statement(stmt, src);
if (!cmd) return false;
expand_error_t err = expand_to_command_and_args(*cmd, vars, out_cmd, nullptr);
return err == EXPAND_OK || err == EXPAND_WILDCARD_MATCH;
expand_result_t err = expand_to_command_and_args(*cmd, vars, out_cmd, nullptr);
return err == expand_result_t::ok || err == expand_result_t::wildcard_match;
}
rgb_color_t highlight_get_color(const highlight_spec_t &highlight, bool is_background) {