# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1410274778 -7200
# Node ID 52fa8300ce205a8f3c45b3b1874564b7768630ea
# Parent  e219cf1bb321a5bb44100eb2cbc0aaa620765cb4
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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    436,
+/**/
     435,
 /**/
     434,