|
 |
22c937 |
To: vim_dev@googlegroups.com
|
|
|
22c937 |
Subject: Patch 7.4.294
|
|
|
22c937 |
Fcc: outbox
|
|
|
22c937 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
22c937 |
Mime-Version: 1.0
|
|
|
22c937 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c937 |
Content-Transfer-Encoding: 8bit
|
|
|
22c937 |
------------
|
|
|
22c937 |
|
|
|
22c937 |
Patch 7.4.294 (after 7.4.293)
|
|
|
22c937 |
Problem: Test files missing from patch.
|
|
|
22c937 |
Solution: Patch the test files.
|
|
|
22c937 |
Files: src/testdir/test95.in, src/testdir/test95.ok
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.293/src/testdir/test95.in 2014-05-13 18:03:55.729737466 +0200
|
|
|
22c937 |
--- src/testdir/test95.in 2014-05-13 19:16:24.433775533 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 51,57 ****
|
|
|
22c937 |
--- 51,61 ----
|
|
|
22c937 |
:call add(tl, [1, "\u05b9\u05bb", " y\u05b9 x\u05b9\u05bb ", "x\u05b9\u05bb"])
|
|
|
22c937 |
:call add(tl, [2, ".\u05b9\u05bb", " y\u05bb x\u05b9\u05bb ", "x\u05b9\u05bb"])
|
|
|
22c937 |
:call add(tl, [2, "a", "ca\u0300t"])
|
|
|
22c937 |
+ :call add(tl, [2, "ca", "ca\u0300t"])
|
|
|
22c937 |
:call add(tl, [2, "a\u0300", "ca\u0300t", "a\u0300"])
|
|
|
22c937 |
+ :call add(tl, [2, 'a\%C', "ca\u0300t", "a\u0300"])
|
|
|
22c937 |
+ :call add(tl, [2, 'ca\%C', "ca\u0300t", "ca\u0300"])
|
|
|
22c937 |
+ :call add(tl, [2, 'ca\%Ct', "ca\u0300t", "ca\u0300t"])
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
:"""" Test \Z
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 91,105 ****
|
|
|
22c937 |
: try
|
|
|
22c937 |
: let l = matchlist(text, pat)
|
|
|
22c937 |
: catch
|
|
|
22c937 |
! : $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", caused an exception: \"' . v:exception . '\"'
|
|
|
22c937 |
: endtry
|
|
|
22c937 |
:" check the match itself
|
|
|
22c937 |
: if len(l) == 0 && len(t) > matchidx
|
|
|
22c937 |
! : $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", did not match, expected: \"' . t[matchidx] . '\"'
|
|
|
22c937 |
: elseif len(l) > 0 && len(t) == matchidx
|
|
|
22c937 |
! : $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", match: \"' . l[0] . '\", expected no match'
|
|
|
22c937 |
: elseif len(t) > matchidx && l[0] != t[matchidx]
|
|
|
22c937 |
! : $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", match: \"' . l[0] . '\", expected: \"' . t[matchidx] . '\"'
|
|
|
22c937 |
: else
|
|
|
22c937 |
: $put ='OK ' . engine . ' - ' . pat
|
|
|
22c937 |
: endif
|
|
|
22c937 |
--- 95,109 ----
|
|
|
22c937 |
: try
|
|
|
22c937 |
: let l = matchlist(text, pat)
|
|
|
22c937 |
: catch
|
|
|
22c937 |
! : $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", caused an exception: \"' . v:exception . '\"'
|
|
|
22c937 |
: endtry
|
|
|
22c937 |
:" check the match itself
|
|
|
22c937 |
: if len(l) == 0 && len(t) > matchidx
|
|
|
22c937 |
! : $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", did not match, expected: \"' . t[matchidx] . '\"'
|
|
|
22c937 |
: elseif len(l) > 0 && len(t) == matchidx
|
|
|
22c937 |
! : $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", match: \"' . l[0] . '\", expected no match'
|
|
|
22c937 |
: elseif len(t) > matchidx && l[0] != t[matchidx]
|
|
|
22c937 |
! : $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", match: \"' . l[0] . '\", expected: \"' . t[matchidx] . '\"'
|
|
|
22c937 |
: else
|
|
|
22c937 |
: $put ='OK ' . engine . ' - ' . pat
|
|
|
22c937 |
: endif
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 112,118 ****
|
|
|
22c937 |
: let e = t[matchidx + i]
|
|
|
22c937 |
: endif
|
|
|
22c937 |
: if l[i] != e
|
|
|
22c937 |
! : $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", submatch ' . i . ': \"' . l[i] . '\", expected: \"' . e . '\"'
|
|
|
22c937 |
: endif
|
|
|
22c937 |
: endfor
|
|
|
22c937 |
: unlet i
|
|
|
22c937 |
--- 116,122 ----
|
|
|
22c937 |
: let e = t[matchidx + i]
|
|
|
22c937 |
: endif
|
|
|
22c937 |
: if l[i] != e
|
|
|
22c937 |
! : $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", submatch ' . i . ': \"' . l[i] . '\", expected: \"' . e . '\"'
|
|
|
22c937 |
: endif
|
|
|
22c937 |
: endfor
|
|
|
22c937 |
: unlet i
|
|
|
22c937 |
*** ../vim-7.4.293/src/testdir/test95.ok 2014-05-13 18:03:55.729737466 +0200
|
|
|
22c937 |
--- src/testdir/test95.ok 2014-05-13 19:01:54.693767920 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 70,78 ****
|
|
|
22c937 |
--- 70,90 ----
|
|
|
22c937 |
OK 0 - a
|
|
|
22c937 |
OK 1 - a
|
|
|
22c937 |
OK 2 - a
|
|
|
22c937 |
+ OK 0 - ca
|
|
|
22c937 |
+ OK 1 - ca
|
|
|
22c937 |
+ OK 2 - ca
|
|
|
22c937 |
OK 0 - à
|
|
|
22c937 |
OK 1 - à
|
|
|
22c937 |
OK 2 - à
|
|
|
22c937 |
+ OK 0 - a\%C
|
|
|
22c937 |
+ OK 1 - a\%C
|
|
|
22c937 |
+ OK 2 - a\%C
|
|
|
22c937 |
+ OK 0 - ca\%C
|
|
|
22c937 |
+ OK 1 - ca\%C
|
|
|
22c937 |
+ OK 2 - ca\%C
|
|
|
22c937 |
+ OK 0 - ca\%Ct
|
|
|
22c937 |
+ OK 1 - ca\%Ct
|
|
|
22c937 |
+ OK 2 - ca\%Ct
|
|
|
22c937 |
OK 0 - ú\Z
|
|
|
22c937 |
OK 1 - ú\Z
|
|
|
22c937 |
OK 2 - ú\Z
|
|
|
22c937 |
*** ../vim-7.4.293/src/version.c 2014-05-13 19:37:19.489786520 +0200
|
|
|
22c937 |
--- src/version.c 2014-05-13 20:09:45.133803551 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 736,737 ****
|
|
|
22c937 |
--- 736,739 ----
|
|
|
22c937 |
{ /* Add new patch number below this line */
|
|
|
22c937 |
+ /**/
|
|
|
22c937 |
+ 294,
|
|
|
22c937 |
/**/
|
|
|
22c937 |
|
|
|
22c937 |
--
|
|
|
22c937 |
hundred-and-one symptoms of being an internet addict:
|
|
|
22c937 |
156. You forget your friend's name but not her e-mail address.
|
|
|
22c937 |
|
|
|
22c937 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
22c937 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
22c937 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
22c937 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|