aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-02-27 20:33:43 -0500
committerGitHub <noreply@github.com>2017-02-27 20:33:43 -0500
commite0705021c10cba81d71de79de2f8bbebecd121a1 (patch)
tree0f6e2ce4bcc0fdfec7086c2553e28e3f08d16cdf /src/nvim/eval.c
parent86c2adc07463e37a60801e8fd0572402a5d27262 (diff)
parent1fa6d95c67852b7f3c9cba06ca4bc48620f344db (diff)
downloadrneovim-e0705021c10cba81d71de79de2f8bbebecd121a1.tar.gz
rneovim-e0705021c10cba81d71de79de2f8bbebecd121a1.tar.bz2
rneovim-e0705021c10cba81d71de79de2f8bbebecd121a1.zip
Merge pull request #6190 from jamessan/vim-7.4.1991
vim-patch:7.4.1991,7.4.1992,7.4.1993,7.4.1994
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r--src/nvim/eval.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 672c9158ce..3b8b38588b 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -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));
}
/*********************************************