diff --git a/src/version.c b/src/version.c
index abdf18af2..4ace0a020 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    960,
 /**/
     959,
 /**/
diff --git a/src/window.c b/src/window.c
index bbd8d1e51..aeba15f85 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2124,7 +2124,9 @@ close_last_window_tabpage(win, free_buf, prev_curtab)
 {
     if (firstwin == lastwin)
     {
+#ifdef FEAT_AUTOCMD
 	buf_T	*old_curbuf = curbuf;
+#endif
 
 	/*
 	 * Closing the last window in a tab page.  First go to another tab