From: Bram Moolenaar Date: Thu, 31 Dec 2015 15:21:52 +0000 (+0100) Subject: patch 7.4.1006 X-Git-Tag: v7.4.1006 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96c664af27ec9535f2c3cd9b889faad3e9460ad6;p=vim patch 7.4.1006 Problem: The fix in patch 7.3.192 is not tested. Solution: Add a test, one for each regexp engine. (Elias Diem) --- 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 @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1006, /**/ 1005, /**/