updated for version 7.0-008
diff --git a/src/eval.c b/src/eval.c
index 20d9c91..2e4cd12 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -11372,7 +11372,7 @@
if (argvars[2].v_type != VAR_UNKNOWN)
{
char_u *xp_name;
- int xp_namelen;
+ int xp_namelen;
long argt;
rettv->vval.v_string = NULL;
@@ -18963,7 +18963,8 @@
else if (lead > 0)
{
lead = 3;
- if (eval_fname_sid(lv.ll_exp_name != NULL ? lv.ll_exp_name : *pp))
+ if ((lv.ll_exp_name != NULL && eval_fname_sid(lv.ll_exp_name))
+ || eval_fname_sid(*pp))
{
/* It's "s:" or "<SID>" */
if (current_SID <= 0)
diff --git a/src/version.c b/src/version.c
index 17b8181..3f8a31a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 8,
+/**/
7,
/**/
6,