From c2f071c724a1fc83533a95275b503b7e991451d0 Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Wed, 12 Mar 2008 02:22:54 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@948 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/fileio.c  | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/fileio.c b/src/fileio.c
index fbb3ada4..bcabbffc 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 bc906d45..780f6bff 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    271,
+/**/
     270,
 /**/
     269,
-- 
2.11.4.GIT