lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
798d12e
To: vim_dev@googlegroups.com
798d12e
Subject: Patch 7.4.347
798d12e
Fcc: outbox
798d12e
From: Bram Moolenaar <Bram@moolenaar.net>
798d12e
Mime-Version: 1.0
798d12e
Content-Type: text/plain; charset=UTF-8
798d12e
Content-Transfer-Encoding: 8bit
798d12e
------------
798d12e
798d12e
Patch 7.4.347
798d12e
Problem:    test55 fails on some systems.
798d12e
Solution:   Remove the elements that all result in zero and can end up in an
798d12e
	    arbitrary position.
798d12e
Files:	    src/testdir/test55.in, src/testdir/test55.ok
798d12e
798d12e
798d12e
*** ../vim-7.4.346/src/testdir/test55.in	2014-06-25 17:31:04.942737863 +0200
798d12e
--- src/testdir/test55.in	2014-06-26 22:25:33.078674909 +0200
798d12e
***************
798d12e
*** 332,339 ****
798d12e
  :$put =string(reverse(sort(l)))
798d12e
  :$put =string(sort(reverse(sort(l))))
798d12e
  :$put =string(uniq(sort(l)))
798d12e
! :let l=[7, 9, 18, 12, 22, 10.0e-16, -1, 0xff, 0, -0, 0.22, 'foo', 'FOOBAR',{}, []]
798d12e
  :$put =string(sort(copy(l), 'n'))
798d12e
  :$put =string(sort(copy(l), 1))
798d12e
  :$put =string(sort(copy(l), 'i'))
798d12e
  :$put =string(sort(copy(l)))
798d12e
--- 332,340 ----
798d12e
  :$put =string(reverse(sort(l)))
798d12e
  :$put =string(sort(reverse(sort(l))))
798d12e
  :$put =string(uniq(sort(l)))
798d12e
! :let l=[7, 9, 18, 12, 22, 10.0e-16, -1, 0xff, 0.22, 'foo']
798d12e
  :$put =string(sort(copy(l), 'n'))
798d12e
+ :let l=[7, 9, 18, 12, 22, 10.0e-16, -1, 0xff, 0, -0, 0.22, 'foo', 'FOOBAR',{}, []]
798d12e
  :$put =string(sort(copy(l), 1))
798d12e
  :$put =string(sort(copy(l), 'i'))
798d12e
  :$put =string(sort(copy(l)))
798d12e
*** ../vim-7.4.346/src/testdir/test55.ok	2014-06-25 17:31:04.942737863 +0200
798d12e
--- src/testdir/test55.ok	2014-06-26 22:26:38.662677390 +0200
798d12e
***************
798d12e
*** 101,107 ****
798d12e
  [[0, 1, 2], [0, 1, 2], 4, 2, 2, 1.5, 'xaaa', 'x8', 'foo6', 'foo', 'foo', 'A11', '-0']
798d12e
  ['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]]
798d12e
  ['-0', 'A11', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 4, [0, 1, 2]]
798d12e
! [-1, 0, 0, 'foo', 'FOOBAR', {}, [], 1.0e-15, 0.22, 7, 9, 12, 18, 22, 255]
798d12e
  ['foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
798d12e
  ['foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
798d12e
  ['FOOBAR', 'foo', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
798d12e
--- 101,107 ----
798d12e
  [[0, 1, 2], [0, 1, 2], 4, 2, 2, 1.5, 'xaaa', 'x8', 'foo6', 'foo', 'foo', 'A11', '-0']
798d12e
  ['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]]
798d12e
  ['-0', 'A11', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 4, [0, 1, 2]]
798d12e
! [-1, 'foo', 1.0e-15, 0.22, 7, 9, 12, 18, 22, 255]
798d12e
  ['foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
798d12e
  ['foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
798d12e
  ['FOOBAR', 'foo', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
798d12e
*** ../vim-7.4.346/src/version.c	2014-06-26 21:24:53.134537205 +0200
798d12e
--- src/version.c	2014-06-26 22:28:15.402681050 +0200
798d12e
***************
798d12e
*** 736,737 ****
798d12e
--- 736,739 ----
798d12e
  {   /* Add new patch number below this line */
798d12e
+ /**/
798d12e
+     347,
798d12e
  /**/
798d12e
798d12e
-- 
798d12e
Witches prefer brooms: vacuum-cleaners need extension cords!
798d12e
798d12e
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
798d12e
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
798d12e
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
798d12e
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///