h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-28 09:31:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ast_no_templates

Browse Source 
Conflicts:
	configure.ac
	exec.cpp
This commit is contained in:
ridiculousfish
2013-10-06 13:08:57 -07:00
parent e58b73179f fab7299d49
commit dd91779442
99 changed files with 3938 additions and 1626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
highlight.cpp
View File

@@ -1036,7 +1036,7 @@ static void tokenize(const wchar_t * const buff, std::vector<int> &color, const
bool is_cmd = false;
int is_subcommand = 0;
int mark = tok_get_pos(&tok);
color.at(tok_get_pos(&tok)) = HIGHLIGHT_COMMAND;
color.at(tok_get_pos(&tok)) = use_builtin ? HIGHLIGHT_COMMAND : HIGHLIGHT_ERROR;
if (parser_keywords_is_subcommand(cmd))
{
@@ -1049,7 +1049,7 @@ static void tokenize(const wchar_t * const buff, std::vector<int> &color, const
use_command = 0;
use_builtin = 1;
}
else if (cmd == L"command")
else if (cmd == L"command" || cmd == L"exec")
{
use_command = 1;
use_function = 0;