diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-04-27 21:48:35 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-04-27 21:48:35 -0400 |
| commit | b447b865cdb7b1b2e1185d183ff132574fc87546 (patch) | |
| tree | ce709154abd2d7d32829deb104ebda4280a6e128 /src | |
| parent | 2d5520fb256b281e7e32cb48f106e205fc494d76 (diff) | |
| parent | f931e78fe420884447a7a5d4e17f71a2eeeff3cd (diff) | |
| download | rneovim-b447b865cdb7b1b2e1185d183ff132574fc87546.tar.gz rneovim-b447b865cdb7b1b2e1185d183ff132574fc87546.tar.bz2 rneovim-b447b865cdb7b1b2e1185d183ff132574fc87546.zip | |
Merge #4591
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/edit.c | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 005c569561..26966b35c1 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -1359,6 +1359,9 @@ ins_redraw ( update_screen(0); } if (has_event(EVENT_CURSORMOVEDI)) { + // Make sure curswant is correct, an autocommand may call + // getcurpos() + update_curswant(); apply_autocmds(EVENT_CURSORMOVEDI, NULL, NULL, false, curbuf); } if (curwin->w_p_cole > 0) { diff --git a/src/nvim/version.c b/src/nvim/version.c index 51b7ae0001..1c4dcca8f7 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -382,7 +382,7 @@ static int included_patches[] = { // 1299 NA // 1298 NA // 1297 NA - // 1296, + 1296, // 1295 NA // 1294 NA // 1293 NA |