The following shows the diffstat and patchsets between
36338c7..10ee78a^
----------------------------------------------------------------
commit 10ee78a5d7ae84f4d5c7c29000f685596c65267f
Author: Dominik Vogt <dominik.v...@gmx.de>
Date: Sat Sep 27 10:40:41 2014 +0100
Cleanup and a bugfix.
---
mvwm/functions.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/mvwm/functions.c b/mvwm/functions.c
index a3b261c..8e3a9dd 100644
--- a/mvwm/functions.c
+++ b/mvwm/functions.c
@@ -295,7 +295,7 @@ static void __execute_command_line(
char *err_cline;
const char *err_func;
cmdparser_execute_type_t exec_type;
- const func_t *bif = NULL;
+ const func_t *bif;
MvwmFunction *complex_function;
int set_silent;
int do_keep_rc = 0;
@@ -478,16 +478,20 @@ cmdparser_hooks->debug(&pc, "!!!J");
#if 1 /*!!!*/
fprintf(stderr, "!!!pc.cline: '%s'\n", pc.cline);
#endif
+ mask = (w != exc->w.w) ? ECC_W : 0;
+ ecc.w.fw = exc->w.fw;
+ ecc.w.w = w;
+ ecc.w.wcontext = exc->w.wcontext;
if (
(bif->flags & FUNC_NEEDS_WINDOW) &&
!(exec_flags & FUNC_DONT_DEFER))
{
- int rc;
+ Bool rc;
rc = DeferExecution(
&ecc, &mask, bif->cursor, exc->x.elast->type,
(bif->flags & FUNC_ALLOW_UNMANAGED));
- if (rc != 0)
+ if (rc == True)
{
break;
}
@@ -507,10 +511,6 @@ fprintf(stderr, "!!!skip no-defer\n");
* skip command */
break;
}
- mask = (w != exc->w.w) ? ECC_W : 0;
- ecc.w.fw = exc->w.fw;
- ecc.w.w = w;
- ecc.w.wcontext = exc->w.wcontext;
exc2 = exc_clone_context(exc, &ecc, mask);
dummy_w = PressedW;
if (
@@ -863,7 +863,7 @@ static void execute_complex_function(
{
if (DeferExecution(
&ecc, &mask, CRS_SELECT, trigger_evtype,
- do_allow_unmanaged_immediate))
+ do_allow_unmanaged_immediate) == True)
{
func->use_depth--;
__cf_cleanup(
@@ -937,7 +937,7 @@ static void execute_complex_function(
{
if (DeferExecution(
&ecc, &mask, CRS_SELECT, trigger_evtype,
- do_allow_unmanaged))
+ do_allow_unmanaged) == True)
{
func->use_depth--;
__cf_cleanup(
----------------------------------------------------------------
Diffstat:
----------------------------------------------------------------
mvwm/functions.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------
