2 files changed, 44 insertions, 1 deletions

diff --git a/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua b/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua
index 1359b45228..2a4c0149fa 100644
--- a/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua
+++ b/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua
@@ -31,7 +31,8 @@ local function run_test_with_regexpengine(regexpengine)
     h AÀÁÂÃÄÅĀĂĄǍǞǠẢ BḂḆ CÇĆĈĊČ DĎĐḊḎḐ EÈÉÊËĒĔĖĘĚẺẼ FḞ GĜĞĠĢǤǦǴḠ HĤĦḢḦḨ IÌÍÎÏĨĪĬĮİǏỈ JĴ KĶǨḰḴ LĹĻĽĿŁḺ MḾṀ NÑŃŅŇṄṈ OÒÓÔÕÖØŌŎŐƠǑǪǬỎ PṔṖ Q RŔŖŘṘṞ SŚŜŞŠṠ TŢŤŦṪṮ UÙÚÛÜŨŪŬŮŰŲƯǓỦ VṼ WŴẀẂẄẆ XẊẌ YÝŶŸẎỲỶỸ ZŹŻŽƵẐẔ
     i aàáâãäåāăąǎǟǡả bḃḇ cçćĉċč dďđḋḏḑ eèéêëēĕėęěẻẽ fḟ gĝğġģǥǧǵḡ hĥħḣḧḩẖ iìíîïĩīĭįǐỉ jĵǰ kķǩḱḵ lĺļľŀłḻ mḿṁ nñńņňʼnṅṉ oòóôõöøōŏőơǒǫǭỏ pṕṗ q rŕŗřṙṟ sśŝşšṡ tţťŧṫṯẗ uùúûüũūŭůűųưǔủ vṽ wŵẁẃẅẇẘ xẋẍ yýÿŷẏẙỳỷỹ zźżžƶẑẕ
     j 0123❤x
-    k combinations]])
+    k combinations
+    l ä ö ü ᾱ̆́]])
 
   execute('set re=' .. regexpengine)
 
@@ -85,6 +86,11 @@ local function run_test_with_regexpengine(regexpengine)
   execute([[let @w=':%s#comb[i]nations#œ̄ṣ́m̥̄ᾱ̆́#g']])
   execute('@w')
 
+  -- Line l. Ex command ":s/ \?/ /g" should NOT split multi-byte characters
+  -- into bytes (fixed by vim-7.3.192).
+  execute([[/^l]])
+  execute([[s/ \?/ /g]])
+
   -- Additional tests. Test matchstr() with multi-byte characters.
   feed('G')
   execute([[put =matchstr(\"אבגד\", \".\", 0, 2)]])   -- ב
@@ -123,6 +129,7 @@ local function run_test_with_regexpengine(regexpengine)
     i aàáâãäåāăąǎǟǡả bḃḇ cçćĉċč dďđḋḏḑ eèéêëēĕėęěẻẽ fḟ gĝğġģǥǧǵḡ hĥħḣḧḩẖ iìíîïĩīĭįǐỉ jĵǰ kķǩḱḵ lĺļľŀłḻ mḿṁ nñńņňʼnṅṉ oòóôõöøōŏőơǒǫǭỏ pṕṗ q rŕŗřṙṟ sśŝşšṡ tţťŧṫṯẗ uùúûüũūŭůűųưǔủ vṽ wŵẁẃẅẇẘ xẋẍ yýÿŷẏẙỳỷỹ zźżžƶẑ
     j 012❤
     k œ̄ṣ́m̥̄ᾱ̆́
+     l ä ö ü ᾱ̆́
     ב
     בג
     א
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)