diff --git a/src/fileio.c b/src/fileio.c
index fbb3ada47d..bcabbffc88 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -9239,7 +9239,7 @@ aucmd_prepbuf(aco, buf)
     aco_save_T	*aco;		/* structure to save values in */
     buf_T	*buf;		/* new curbuf */
 {
-    aco->save_buf = buf;
+    aco->save_buf = curbuf;
     curbuf = buf;
     curwin->w_buffer = buf;
 }
diff --git a/src/version.c b/src/version.c
index bc906d453c..780f6bff78 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    271,
 /**/
     270,
 /**/