To: vim_dev@googlegroups.com Subject: Patch 7.4.1548 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1548 (after 7.4.1546) Problem: Two tests fail. Solution: Adjust the expected error number. Remove check for type. Files: src/testdir/test101.ok, src/testdir/test55.in, src/testdir/test55.ok *** ../vim-7.4.1547/src/testdir/test101.ok 2014-11-27 19:14:45.080940970 +0100 --- src/testdir/test101.ok 2016-03-12 19:28:36.325612808 +0100 *************** *** 9,12 **** 0:not highlighted 1:highlighted 0:not highlighted ! Vim(let):E706: --- 9,12 ---- 0:not highlighted 1:highlighted 0:not highlighted ! Vim(let):E745: *** ../vim-7.4.1547/src/testdir/test55.in 2015-05-04 11:10:21.543941803 +0200 --- src/testdir/test55.in 2016-03-12 19:31:36.891725546 +0100 *************** *** 59,75 **** : $put =v:exception :endtry :" - :" Changing var type should fail - :try - : let d = [] - :catch - : $put =v:exception[:14] . v:exception[-1:-1] - :endtry - :try - : let l = {} - :catch - : $put =v:exception[:14] . v:exception[-1:-1] - :endtry :" :" removing items with :unlet :unlet l[2] --- 59,64 ---- *** ../vim-7.4.1547/src/testdir/test55.ok 2015-05-04 11:10:21.543941803 +0200 --- src/testdir/test55.ok 2016-03-12 19:31:30.711790129 +0100 *************** *** 19,26 **** {'c': 'ccc', '1': 99, 'b': [1, 2, function('strlen')], '3': 33, '-1': {'a': 1}} {'c': 'ccc', '1': 99, '3': 33, '-1': {'a': 1}} 101101 - Vim(let):E706: d - Vim(let):E706: l [1, 'as''d', {'a': 1}] [4] {'1': 99, '3': 33} --- 19,24 ---- *** ../vim-7.4.1547/src/version.c 2016-03-12 19:22:43.785293244 +0100 --- src/version.c 2016-03-12 19:33:25.066595213 +0100 *************** *** 745,746 **** --- 745,748 ---- { /* Add new patch number below this line */ + /**/ + 1548, /**/ -- The technology involved in making anything invisible is so infinitely complex that nine hundred and ninety-nine billion, nine hundred and ninety-nine million, nine hundred and ninety-nine thousand, nine hundred and ninety-nine times out of a trillion it is much simpler and more effective just to take the thing away and do without it. -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// 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 ///