On Sun, Sep 07, 2014 at 07:15:26AM -0700, Thomas Adam wrote: > The mvwm repository's new-parser branch has been updated. > > The following shows the diffstat and patchsets between the merged result > and HEAD. > > false
Apologies for this; I've fixed this bug, and this shouldn't happen again. For completeness: commit 30a0d418fee4a5ec9345ced3418b435feabffa7c Author: Thomas Adam <[email protected]> Date: Sun Sep 7 15:12:18 2014 +0100 Rename __execute_function -> __execute_command_line By the time __execute_function() is called, the function/command involved has already been identified. Instead, call this __execute_command_line() to more accurately reflect its job. --- mvwm/functions.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mvwm/functions.c b/mvwm/functions.c index 6e7f5f1..0a91de3 100644 --- a/mvwm/functions.c +++ b/mvwm/functions.c @@ -349,7 +349,7 @@ static const func_t *find_builtin_function(char *func) return ret_func; } -static void __execute_function( +static void __execute_command_line( cond_rc_t *cond_rc, const exec_context_t *exc, char *action, FUNC_FLAGS_TYPE exec_flags, char *args[], Bool has_ref_window_moved) { @@ -394,7 +394,7 @@ static void __execute_function( if (func_depth > MAX_FUNCTION_DEPTH) { mvwm_msg( - ERR, "__execute_function", + ERR, "__execute_command_line", "Function '%s' called with a depth of %i, " "stopping function execution!", action, func_depth); @@ -545,7 +545,7 @@ static void __execute_function( (!bif || !(bif->flags & FUNC_DECOR))) { mvwm_msg( - ERR, "__execute_function", + ERR, "__execute_command_line", "Command can not be added to a decor; executing" " command now: '%s'", action); } @@ -583,7 +583,7 @@ static void __execute_function( if (Scr.cur_decor && Scr.cur_decor != &Scr.DefaultDecor) { mvwm_msg( - WARN, "__execute_function", + WARN, "__execute_command_line", "Command can not be added to a decor;" " executing command now: '%s'", expaction); } @@ -670,7 +670,7 @@ static void __execute_function( *function != 0 && !set_silent) { mvwm_msg( - ERR, "__execute_function", + ERR, "__execute_command_line", "No such command '%s'", function); } @@ -839,7 +839,7 @@ static void __run_complex_function_items( } if (c == cond) { - __execute_function( + __execute_command_line( cond_rc, exc, fi->action, FUNC_DONT_DEFER, args, has_ref_window_moved); if (!has_ref_window_moved && PressedW && @@ -1277,7 +1277,7 @@ void execute_function( cond_rc_t *cond_rc, const exec_context_t *exc, char *action, FUNC_FLAGS_TYPE exec_flags) { - __execute_function(cond_rc, exc, action, exec_flags, NULL, False); + __execute_command_line(cond_rc, exc, action, exec_flags, NULL, False); return; }
