h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-30 19:41:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'event-bug-test' of git://github.com/JanKanis/fish-shell into JanKanis-event-bug-test

Browse Source
This commit is contained in:
ridiculousfish
2012-12-22 12:20:41 -08:00
parent d6b5558cf2 8a446f43ff
commit 8a66ba6c35
13 changed files with 217 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
builtin.cpp
View File

@@ -1009,15 +1009,15 @@ static int builtin_emit(parser_t &parser, wchar_t **argv)
}
for (; woptind < argc; woptind++)
{
event_fire_generic(argv[woptind]);
if(!argv[woptind]) {
append_format(stderr_buffer, L"%ls: expected event name\n", argv[0]);
return STATUS_BUILTIN_ERROR;
}
wchar_t *eventname = argv[woptind];
wcstring_list_t args(argv + woptind + 1, argv + argc);
event_fire_generic(eventname, &args);
return STATUS_BUILTIN_OK;
}
@@ -1099,7 +1099,7 @@ static void functions_def(const wcstring &name, wcstring &out)
search.function_name = name;
std::vector<event_t *> ev;
event_get(&search, &ev);
event_get(search, &ev);
out.append(L"function ");