updated for version 7.2-098

diff --git a/src/eval.c b/src/eval.c
index 76a6044a81b1a0538e79c363b8ade8a7cef9a3f9..98979b175f6a54466b1fbfa3bbbb8f27e1ab96a5 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -3928,7 +3928,7 @@ eval0(arg, rettv, nextcmd, evaluate)
 
 /*
  * Handle top level expression:
- *     expr1 ? expr0 : expr0
+ *     expr2 ? expr1 : expr1
  *
  * "arg" must point to the first non-white of the expression.
  * "arg" is advanced to the next non-white after the recognized expression.
@@ -19912,7 +19912,7 @@ ex_function(eap)
                                                      : eval_isnamec(arg[j])))
                ++j;
            if (arg[j] != NUL)
-               emsg_funcname(e_invarg2, arg);
+               emsg_funcname((char *)e_invarg2, arg);
        }
     }
 

diff --git a/src/version.c b/src/version.c
index d5e44843d811af576c0b749aa34d55a9ec02fe19..4aeef69e417248983ec1020f56774900d4088628 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    98,
 /**/
     97,
 /**/