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.

diff --git a/src/edit.c b/src/edit.c
index 4edf4f4f67ebbb8853f17f04748fe1b6a830ed63..344f3793accbd3fb0b6d0d503afc3871554e8b7b 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -1611,7 +1611,12 @@ ins_redraw(
 # endif
 # ifdef FEAT_AUTOCMD
        if (has_cursormovedI())
+       {
+           /* Make sure curswant is correct, an autocommand may call
+            * getcurpos(). */
+           update_curswant();
            apply_autocmds(EVENT_CURSORMOVEDI, NULL, NULL, FALSE, curbuf);
+       }
 # endif
 # ifdef FEAT_CONCEAL
        if (curwin->w_p_cole > 0)

diff --git a/src/version.c b/src/version.c
index 491b94a98ce0cfdc214359fc76a650cf5e27f523..131ef4bc1a07a5de649f20a54c6d5c8fbc03dbe8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1296,
 /**/
     1295,
 /**/