diff --git a/src/eval.c b/src/eval.c
index 10df05b..1b26747 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -7108,7 +7108,7 @@
     {"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 @@
     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 c243d17..92b1cb6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    42,
+/**/
     41,
 /**/
     40,