vim-patch:7.4.1296

Problem:    Cursor changes column with up motion when the matchparen plugin
            saves and restores the cursor position. (Martin Kunev)
Solution:   Make sure curswant is updated before invoking the autocommand.

f068dcafcf

Applied manually.

Could reproduce the bug with vim/vim@4d8747c but not with vim/vim@2693ca2,
so it must have appeared inbetween. For discussion, see

https://groups.google.com/forum/#!msg/vim_dev/t2sdeFhkybs/WEtLJpCODQAJ
http://vim.1045645.n5.nabble.com/Cursor-behaviour-change-td5726895.html

Could not reproduce with current nvim master.

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) {

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