patch 8.2.5088: value of cmod_verbose is a bit complicated to use
Problem: Value of cmod_verbose is a bit complicated to use.
Solution: Use zero for not set, value + 1 when set. (closes #10564)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 9a06999..a6f5952 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3089,12 +3089,11 @@
break;
if (vim_isdigit(*eap->cmd))
{
- cmod->cmod_verbose = atoi((char *)eap->cmd);
- if (cmod->cmod_verbose == 0)
- cmod->cmod_verbose = -1;
+ // zero means not set, one is verbose == 0, etc.
+ cmod->cmod_verbose = atoi((char *)eap->cmd) + 1;
}
else
- cmod->cmod_verbose = 1;
+ cmod->cmod_verbose = 2; // default: verbose == 1
eap->cmd = p;
continue;
}
@@ -3147,7 +3146,7 @@
|| (cmod->cmod_flags
& ~(CMOD_SILENT | CMOD_ERRSILENT | CMOD_UNSILENT)) != 0))
|| cmod->cmod_split != 0
- || cmod->cmod_verbose != 0
+ || cmod->cmod_verbose > 0
|| cmod->cmod_tab != 0
|| cmod->cmod_filter_regmatch.regprog != NULL;
}
@@ -3182,11 +3181,11 @@
cmod->cmod_did_sandbox = TRUE;
}
#endif
- if (cmod->cmod_verbose != 0)
+ if (cmod->cmod_verbose > 0)
{
if (cmod->cmod_verbose_save == 0)
cmod->cmod_verbose_save = p_verbose + 1;
- p_verbose = cmod->cmod_verbose < 0 ? 0 : cmod->cmod_verbose;
+ p_verbose = cmod->cmod_verbose - 1;
}
if ((cmod->cmod_flags & (CMOD_SILENT | CMOD_UNSILENT))