diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2013-02-14 15:50:24 -0800 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-02-14 15:52:24 -0800 |
commit | 8d95d0834d4f327ba2a4d829c64050cda80cb302 (patch) | |
tree | 156b85042e739c3409206b367041c6e9c7d39064 /builtin.cpp | |
parent | db5eebd37240adb5fed785a39b79585a78489c8d (diff) |
First stab at builtin set_color. Moved set_color.cpp to builtin_set_color.cpp and taught fish about it.
Diffstat (limited to 'builtin.cpp')
-rw-r--r-- | builtin.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin.cpp b/builtin.cpp index e8254533..007adc12 100644 --- a/builtin.cpp +++ b/builtin.cpp @@ -167,7 +167,7 @@ static const io_chain_t *real_io; static int builtin_count_args(wchar_t **argv) { int argc = 1; - while (argv[argc] != 0) + while (argv[argc] != NULL) { argc++; } @@ -390,6 +390,7 @@ static void builtin_missing_argument(parser_t &parser, const wchar_t *cmd, const #include "builtin_complete.cpp" #include "builtin_ulimit.cpp" #include "builtin_jobs.cpp" +#include "builtin_set_color.cpp" /* builtin_test lives in builtin_test.cpp */ int builtin_test(parser_t &parser, wchar_t **argv); @@ -4030,6 +4031,7 @@ static const builtin_data_t builtin_datas[]= { L"read", &builtin_read, N_(L"Read a line of input into variables") }, { L"return", &builtin_return, N_(L"Stop the currently evaluated function") }, { L"set", &builtin_set, N_(L"Handle environment variables") }, + { L"set_color", &builtin_set_color, N_(L"Set the terminal color") }, { L"status", &builtin_status, N_(L"Return status information about fish") }, { L"switch", &builtin_switch, N_(L"Conditionally execute a block of commands") }, { L"test", &builtin_test, N_(L"Test a condition") }, |