Merge pull request #6190 from jamessan/vim-7.4.1991

vim-patch:7.4.1991,7.4.1992,7.4.1993,7.4.1994
This commit is contained in:
James McCoy
2017-02-27 20:33:43 -05:00
committed by GitHub
6 changed files with 246 additions and 82 deletions

View File

@@ -7715,11 +7715,13 @@ static void emsg_funcname(char *ermsg, char_u *name)
*/
static int non_zero_arg(typval_T *argvars)
{
return (argvars[0].v_type == VAR_NUMBER
&& argvars[0].vval.v_number != 0)
|| (argvars[0].v_type == VAR_STRING
&& argvars[0].vval.v_string != NULL
&& *argvars[0].vval.v_string != NUL);
return ((argvars[0].v_type == VAR_NUMBER
&& argvars[0].vval.v_number != 0)
|| (argvars[0].v_type == VAR_SPECIAL
&& argvars[0].vval.v_special == kSpecialVarTrue)
|| (argvars[0].v_type == VAR_STRING
&& argvars[0].vval.v_string != NULL
&& *argvars[0].vval.v_string != NUL));
}
/*********************************************