updated for version 7.0-008

diff --git a/src/eval.c b/src/eval.c
index 20d9c91e1f39033d3018fd01d9a9f1d8be5b95af..2e4cd12f05b4c15b4cf4be53af3cbdc8271d0125 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -11372,7 +11372,7 @@ f_input(argvars, rettv)
            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 @@ trans_function_name(pp, skip, flags, fdp)
     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 17b8181c7a6076fca2c1fc28e101db2fc2bd3f2c..3f8a31a07b39986ad2fd0bed0fb0399b973fc33b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    8,
 /**/
     7,
 /**/