updated for version 7.1-042

diff --git a/src/eval.c b/src/eval.c
index 10df05b42a074d5bd4f35f7dbe20148a36ea2dc0..1b26747388aba5244ca865edc5926449378c7e1b 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -7108,7 +7108,7 @@ static struct fst
     {"getftype",       1, 1, f_getftype},
     {"getline",                1, 2, f_getline},
     {"getloclist",     1, 1, f_getqflist},
-    {"getmatches",     0, 0, f_getmatches},
+    {"getmatches",     0, 0, f_getmatches},
     {"getpos",         1, 1, f_getpos},
     {"getqflist",      0, 0, f_getqflist},
     {"getreg",         0, 2, f_getreg},
@@ -12526,9 +12526,11 @@ f_matchadd(argvars, rettv)
     if (grp == NULL || pat == NULL)
        return;
     if (argvars[2].v_type != VAR_UNKNOWN)
+    {
        prio = get_tv_number_chk(&argvars[2], &error);
-    if (argvars[3].v_type != VAR_UNKNOWN)
-       id = get_tv_number_chk(&argvars[3], &error);
+       if (argvars[3].v_type != VAR_UNKNOWN)
+           id = get_tv_number_chk(&argvars[3], &error);
+    }
     if (error == TRUE)
        return;
     if (id >= 1 && id <= 3)

diff --git a/src/version.c b/src/version.c
index c243d1730085781bdae2626da400125d57a7ea6f..92b1cb619c8010c90f20be9adb2e3445df0d6e87 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 */
+/**/
+    42,
 /**/
     41,
 /**/