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 f2d204078670371119d100fb1d985b220783342f..b9221ed400b8b8307c62211ed3075e83f5add14b 100644 (file)
--- 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 5025c688757bbade2f9e7a8b3f7813d0c55f0639..521f2d88c9eca13ba38cea46711550bac7dd854c 100644 (file)
--- 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,
 /**/