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