diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index d0df1fd9f..13d5fe495 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -10890,6 +10890,9 @@ eval_vars(
 		result = strbuf;
 		break;
 #endif
+	default:
+		result = (char_u *)""; /* avoid gcc warning */
+		break;
 	}
 
 	resultlen = (int)STRLEN(result);	/* length of new string */
diff --git a/src/version.c b/src/version.c
index dd39fcdac..700b4bd1e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    598,
 /**/
     597,
 /**/