summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-09-09 16:59:38 +0200
committerBram Moolenaar <Bram@vim.org>2014-09-09 16:59:38 +0200
commit371932a7754453b5a3adbd41959056fc9a45a9fd (patch)
treedd9fc88fa357005a203cd9fa5fd7852d32f2f498
parent0026d47d8cb6e6b135527ca489bbf81ac8e0045a (diff)
downloadvim-git-371932a7754453b5a3adbd41959056fc9a45a9fd.tar.gz
updated for version 7.4.436v7.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)
-rw-r--r--src/fileio.c3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/fileio.c b/src/fileio.c
index f2d204078..b9221ed40 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 5025c6887..521f2d88c 100644
--- 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,