From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 9 Sep 2014 14:59:38 +0000 (+0200)
Subject: updated for version 7.4.436
X-Git-Tag: v7.4.436
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=371932a7754453b5a3adbd41959056fc9a45a9fd;p=thirdparty%2Fvim.git

updated for version 7.4.436
Problem:    ml_get error for autocommand that moves the cursor of the current
            window.
Solution:   Check the cursor position after switching back to the current
            buffer.  (Christian Brabandt)
---

diff --git a/src/fileio.c b/src/fileio.c
index f2d2040786..b9221ed400 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -9009,6 +9009,9 @@ win_found:
 
 	    curwin = aco->save_curwin;
 	    curbuf = curwin->w_buffer;
+	    /* In case the autocommand move the cursor to a position that that
+	     * not exist in curbuf. */
+	    check_cursor();
 	}
     }
 }
diff --git a/src/version.c b/src/version.c
index 5025c68875..521f2d88c9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    436,
 /**/
     435,
 /**/