Merge #4591

3 files changed, 40 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
diff --git a/test/functional/plugin/matchparen_spec.lua b/test/functional/plugin/matchparen_spec.lua
new file mode 100644
index 0000000000..d8c1f2d392
--- /dev/null
+++ b/test/functional/plugin/matchparen_spec.lua
@@ -0,0 +1,36 @@
+local helpers = require('test.functional.helpers')
+local Screen = require('test.functional.ui.screen')
+local clear, feed, execute = helpers.clear, helpers.feed, helpers.execute
+
+describe('matchparen', function() 
+  local screen
+
+  before_each(function()
+    clear()
+    screen = Screen.new(20,5)
+    screen:attach()
+    screen:set_default_attr_ignore( {{bold=true, foreground=Screen.colors.Blue}} )
+  end)
+
+  it('uses correct column after i_<Up>. Vim patch 7.4.1296', function()
+    execute('set noai nosi nocin')
+    execute('runtime plugin/matchparen.vim')
+    feed('ivoid f_test()<cr>')
+    feed('{<cr>')
+    feed('}')
+
+    -- critical part: up + cr should result in an empty line inbetween the
+    -- brackets... if the bug is there, the empty line will be before the '{'
+    feed('<up>')
+    feed('<cr>')
+
+    screen:expect([[
+      void f_test()       |
+      {                   |
+      ^                    |
+      }                   |
+      {1:-- INSERT --}        |
+    ]], {[1] = {bold = true}})    
+
+  end)
+end)