diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-12-01 00:14:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-01 00:14:16 -0500 |
| commit | 0e1c406df4e661602b67dde5e46d69fe7345b1a9 (patch) | |
| tree | cdb451dc919e246adfaa6c01345741f6dbc1652a | |
| parent | 5679ceb3a832239d21b2dce48a5a4cf7c31a534d (diff) | |
| parent | 783220e42720526227dcd379c7bc10d8b9e4d941 (diff) | |
| download | rneovim-0e1c406df4e661602b67dde5e46d69fe7345b1a9.tar.gz rneovim-0e1c406df4e661602b67dde5e46d69fe7345b1a9.tar.bz2 rneovim-0e1c406df4e661602b67dde5e46d69fe7345b1a9.zip | |
Merge pull request #5662 from brcolow/vim-7.4.1701
vim-patch:7.4.1701
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 4ee381064b..11c8a72b2a 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -743,7 +743,7 @@ static int included_patches[] = { 1704, 1703, // 1702, - // 1701, + 1701, 1700, 1699, // 1698 NA 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 4189e8a33a..c6883e4902 100644 --- a/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua +++ b/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua @@ -28,8 +28,6 @@ local function run_test_with_regexpengine(regexpengine) e y f z g a啷bb - 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 l ä ö ü ᾱ̆́]]) @@ -68,14 +66,6 @@ local function run_test_with_regexpengine(regexpengine) feed([[/\%U12345678<cr>x]]) feed([[/[\U1234abcd\u1234\uabcd]<cr>x]]) feed([[/\%d21879b<cr>x]]) - feed('/ [[=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=]]*/e<cr>x') - feed('/ [[=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=]]*/e<cr>x') -- Line j. Test backwards search from a multi-byte character. feed('/x<cr>x') @@ -125,8 +115,6 @@ local function run_test_with_regexpengine(regexpengine) e y f z g abb - 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 012❤ k œ̄ṣ́m̥̄ᾱ̆́ l ä ö ü ᾱ̆́ |