diff --git a/src/version.c b/src/version.c
index abdf18a..4ace0a0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    960,
+/**/
     959,
 /**/
     958,
diff --git a/src/window.c b/src/window.c
index bbd8d1e..aeba15f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2124,7 +2124,9 @@
 {
     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