diff --git a/src/message.c b/src/message.c
index aebf01bb81..8f0a9c6320 100644
--- a/src/message.c
+++ b/src/message.c
@@ -4175,15 +4175,16 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)
 			str_arg_l = 0;
 		    else
 		    {
+			/* Don't put the #if inside memchr(), it can be a
+			 * macro. */
+#if SIZEOF_INT <= 2
+			char *q = memchr(str_arg, '\0', precision);
+#else
 			/* memchr on HP does not like n > 2^31  !!! */
 			char *q = memchr(str_arg, '\0',
-#if SIZEOF_INT <= 2
-				precision
-#else
-				precision <= (size_t)0x7fffffffL ? precision
-						       : (size_t)0x7fffffffL
+				  precision <= (size_t)0x7fffffffL ? precision
+						       : (size_t)0x7fffffffL);
 #endif
-						       );
 			str_arg_l = (q == NULL) ? precision : q - str_arg;
 		    }
 		    break;
diff --git a/src/version.c b/src/version.c
index e0503ca2f5..17b8181c7a 100644
--- 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 */
+/**/
+    7,
 /**/
     6,
 /**/