diff --git a/src/fileio.c b/src/fileio.c
index e7d1c75..fa07afe 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -8597,6 +8597,7 @@
 	    curwin = firstwin;
 # ifdef FEAT_EVAL
 	vars_clear(&aucmd_win->w_vars.dv_hashtab);  /* free all w: variables */
+	hash_init(&aucmd_win->w_vars.dv_hashtab);   /* re-use the hashtab */
 # endif
 #else
 	curwin = aco->save_curwin;
diff --git a/src/version.c b/src/version.c
index f55d028..f5dbc98 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    298,
+/**/
     297,
 /**/
     296,