To: vim_dev@googlegroups.com Subject: Patch 7.4.2333 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2333 Problem: Outdated comments in test. Solution: Cleanup normal mode test. (Christian Brabandt) Files: src/testdir/test_normal.vim *** ../vim-7.4.2332/src/testdir/test_normal.vim 2016-09-04 15:13:36.617508762 +0200 --- src/testdir/test_normal.vim 2016-09-05 22:49:24.322418349 +0200 *************** *** 36,82 **** endfunction fun! Test_normal00_optrans() - " Attention: This needs to be the very first test, - " it will fail, if it runs later, don't know why! - " Test for S s and alike comamnds, that are internally handled aliased new call append(0, ['1 This is a simple test: abcd', '2 This is the second line', '3 this is the third line']) 1 exe "norm! Sfoobar\" call assert_equal(['foobar', '2 This is the second line', '3 this is the third line', ''], getline(1,'$')) 2 - " Test does not work - " TODO: Why does it not work? - " Adds an additional linebreak if used in visual mode... - " When run in the test, this returns: - " ,-------- - " |foobar - " |2 This is - " |the second - " |one - " |3 this is the third line - " `----------- - " instead of - " ,-------- - " |foobar - " |2 This is the second one - " |3 this is the third line - " `----------- exe "norm! $vbsone" call assert_equal(['foobar', '2 This is the second one', '3 this is the third line', ''], getline(1,'$')) - " When run in the test, this returns: - " ,-------- - " |foobar - " |Second line - " |here - " |3 this is the third line - " `----------- - " instead of - " ,-------- - " |foobar - " |Second line here - " |3 this is the third line - " `----------- norm! VS Second line here call assert_equal(['foobar', ' Second line here', '3 this is the third line', ''], getline(1, '$')) %d --- 36,49 ---- *************** *** 248,254 **** norm! gggqG call assert_equal(['1 2 3', '4 5 6', '7 8 9', '10 11 '], getline(1, '$')) " clean up ! set formatprg= bw! endfu --- 215,221 ---- norm! gggqG call assert_equal(['1 2 3', '4 5 6', '7 8 9', '10 11 '], getline(1, '$')) " clean up ! set formatprg= tw=0 bw! endfu *************** *** 1719,1725 **** " Test for g< " Cannot capture its output, " probably a bug, therefore, test disabled: ! return echo "a\nb\nc\nd" let b=execute(':norm! g<') call assert_true(!empty(b), 'failed `execute(g<)`') --- 1686,1692 ---- " Test for g< " Cannot capture its output, " probably a bug, therefore, test disabled: ! throw "Skipped: output of g< can't be tested currently" echo "a\nb\nc\nd" let b=execute(':norm! g<') call assert_true(!empty(b), 'failed `execute(g<)`') *************** *** 1877,1883 **** " clean up set sts=0 sw=8 ts=8 ! "bw! endfu func! Test_normal42_halfpage() --- 1844,1850 ---- " clean up set sts=0 sw=8 ts=8 ! bw! endfu func! Test_normal42_halfpage() *** ../vim-7.4.2332/src/version.c 2016-09-05 22:45:25.072731086 +0200 --- src/version.c 2016-09-05 22:53:44.931920248 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2333, /**/ -- If Apple would build a car... ... it would be powered by the sun, be reliable, five times as fast and twice as easy to drive; but would only run on five percent of the roads. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///