diff options
author | 2008-09-23 09:55:42 -0400 | |
---|---|---|
committer | 2008-09-23 09:55:42 -0400 | |
commit | 587e92c69db795c54ae3f12e8ce9ab0d1fe21021 (patch) | |
tree | 32d9fe51a561ff6ee6a67dedcb3cb519d1ef5526 | |
parent | 671153c765a1b2899bed564c50d718f9244f3287 (diff) | |
download | textadept-587e92c69db795c54ae3f12e8ce9ab0d1fe21021.tar.gz textadept-587e92c69db795c54ae3f12e8ce9ab0d1fe21021.zip |
Merged overloaded 'l_handle_event' functions into one with default parameter.
-rw-r--r-- | src/lua_interface.c | 14 | ||||
-rw-r--r-- | src/textadept.h | 3 |
2 files changed, 4 insertions, 13 deletions
diff --git a/src/lua_interface.c b/src/lua_interface.c index 9b9163ce..63cf8944 100644 --- a/src/lua_interface.c +++ b/src/lua_interface.c @@ -642,20 +642,12 @@ void l_handle_error(LS *lua, const char *errmsg) { /** * Handles a Textadept event. * @param s String event name. - */ -bool l_handle_event(const char *s) { - return l_is_ta_table_function("events", s) ? l_call_function(0, 1) : false; -} - -/** - * Handles a Textadept event. - * @param s String event name. - * @param arg String first argument. + * @param arg Optional string argument. */ bool l_handle_event(const char *s, const char *arg) { if (!l_is_ta_table_function("events", s)) return false; - lua_pushstring(lua, arg); - return l_call_function(1, 1); + if (arg) lua_pushstring(lua, arg); + return l_call_function(arg ? 1 : 0, 1); } /** diff --git a/src/textadept.h b/src/textadept.h index 581be76f..4397b5f2 100644 --- a/src/textadept.h +++ b/src/textadept.h @@ -79,8 +79,7 @@ void l_goto_scintilla_buffer(GtkWidget *editor, int n, bool absolute); void l_set_buffer_global(ScintillaObject *sci); void l_handle_error(lua_State *lua, const char *errmsg); -bool l_handle_event(const char *e); -bool l_handle_event(const char *e, const char *arg); +bool l_handle_event(const char *e, const char *arg=NULL); bool l_handle_keypress(int keyval, bool shift, bool control, bool alt); void l_handle_scnnotification(SCNotification *n); void l_ta_command(const char *command); |