diff --git a/src/buffer.c b/src/buffer.c
index 81f6fde..d4a9c1e 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -416,7 +416,11 @@
 #endif
 
     buf_freeall(buf, (del_buf ? BFA_DEL : 0) + (wipe_buf ? BFA_WIPE : 0));
-    if (win_valid(win) && win->w_buffer == buf)
+    if (
+#ifdef FEAT_WINDOWS
+	win_valid(win) &&
+#endif
+			  win->w_buffer == buf)
 	win->w_buffer = NULL;  /* make sure we don't use the buffer now */
 
 #ifdef FEAT_AUTOCMD
diff --git a/src/version.c b/src/version.c
index 42b4d5c..beb7347 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    312,
+/**/
     311,
 /**/
     310,