summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-12-31 16:21:52 +0100
committerBram Moolenaar <Bram@vim.org>2015-12-31 16:21:52 +0100
commit96c664af27ec9535f2c3cd9b889faad3e9460ad6 (patch)
tree24747a75a0c9e6e62f1c7598223a48cd3864d2a5
parent86e179dbe75010e9545e1a2fcc92a15d57bf27fd (diff)
downloadvim-git-96c664af27ec9535f2c3cd9b889faad3e9460ad6.tar.gz
patch 7.4.1006v7.4.1006
Problem: The fix in patch 7.3.192 is not tested. Solution: Add a test, one for each regexp engine. (Elias Diem)
-rw-r--r--src/testdir/test44.in5
-rw-r--r--src/testdir/test44.ok1
-rw-r--r--src/testdir/test99.in5
-rw-r--r--src/testdir/test99.ok1
-rw-r--r--src/version.c2
5 files changed, 14 insertions, 0 deletions
diff --git a/src/testdir/test44.in b/src/testdir/test44.in
index 23bb4f815..44c3ea711 100644
--- a/src/testdir/test44.in
+++ b/src/testdir/test44.in
@@ -44,6 +44,10 @@ x?.
x:" k
:let @w=':%s#comb[i]nations#œ̄ṣ́m̥̄ᾱ̆́#g'
:@w
+:"
+:" l Test what 7.3.192 fixed
+/^l
+:s/ \?/ /g
:?^1?,$w! test.out
:e! test.out
G:put =matchstr(\"אבגד\", \".\", 0, 2) " ב
@@ -80,3 +84,4 @@ h AÀÁÂÃÄÅĀĂĄǍǞǠẢ BḂḆ CÇĆĈĊČ DĎĐḊḎḐ EÈÉÊËĒĔ
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 äö üᾱ̆́
diff --git a/src/testdir/test44.ok b/src/testdir/test44.ok
index d9a1206cc..42b46e912 100644
--- a/src/testdir/test44.ok
+++ b/src/testdir/test44.ok
@@ -18,6 +18,7 @@ h AÀÁÂÃÄÅĀĂĄǍǞǠẢ BḂḆ CÇĆĈĊČ DĎĐḊḎḐ EÈÉÊËĒĔ
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/src/testdir/test99.in b/src/testdir/test99.in
index 77828f4b6..d992d4d6f 100644
--- a/src/testdir/test99.in
+++ b/src/testdir/test99.in
@@ -36,6 +36,10 @@ x:" Test backwards search from a multi-byte char
x?.
x:let @w=':%s#comb[i]nations#œ̄ṣ́m̥̄ᾱ̆́#g'
:@w
+:"
+:" l Test what 7.3.192 fixed
+/^l
+:s/ \?/ /g
:?^1?,$w! test.out
:e! test.out
G:put =matchstr(\"אבגד\", \".\", 0, 2) " ב
@@ -66,3 +70,4 @@ h AÀÁÂÃÄÅĀĂĄǍǞǠẢ BḂḆ CÇĆĈĊČ DĎĐḊḎḐ EÈÉÊËĒĔ
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 äö üᾱ̆́
diff --git a/src/testdir/test99.ok b/src/testdir/test99.ok
index 0bd0b8ab7..330f4550c 100644
--- a/src/testdir/test99.ok
+++ b/src/testdir/test99.ok
@@ -18,6 +18,7 @@ h AÀÁÂÃÄÅĀĂĄǍǞǠẢ BḂḆ CÇĆĈĊČ DĎĐḊḎḐ EÈÉÊËĒĔ
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/src/version.c b/src/version.c
index b69318113..965eec415 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1006,
+/**/
1005,
/**/
1004,