diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-06 13:08:57 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-06 13:08:57 -0700 |
| commit | dd91779442125ca46a434cd94cc51ae32e43bee1 (patch) | |
| tree | e023ebb7a8a0e6f9c6c4a394158773ced0c98a82 /highlight.cpp | |
| parent | e58b73179f4727c79465c6f273aef377b9bb8bee (diff) | |
| parent | fab7299d49492ce548d4ceed66d3acbd05dd99c7 (diff) | |
Merge branch 'master' into ast_no_templates
Conflicts:
configure.ac
exec.cpp
Diffstat (limited to 'highlight.cpp')
| -rw-r--r-- | highlight.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/highlight.cpp b/highlight.cpp index f2a7d6e0..dc221a2f 100644 --- a/highlight.cpp +++ b/highlight.cpp @@ -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; |