To: vim_dev@googlegroups.com Subject: Patch 7.4.2161 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2161 (after 7.4.2160) Problem: Expression test fails without conceal feature. Solution: Only check "conceal" with the conceal feature. Files: src/testdir/test_expr.vim *** ../vim-7.4.2160/src/testdir/test_expr.vim 2016-08-05 22:22:02.559334887 +0200 --- src/testdir/test_expr.vim 2016-08-05 22:49:55.981764977 +0200 *************** *** 198,205 **** func Test_setmatches() hi def link 1 Comment hi def link 2 PreProc ! let set = [{"group": 1, "pattern": 2, "id": 3, "priority": 4, "conceal": 5}] ! let exp = [{"group": '1', "pattern": '2', "id": 3, "priority": 4, "conceal": '5'}] call setmatches(set) call assert_equal(exp, getmatches()) endfunc --- 198,209 ---- func Test_setmatches() hi def link 1 Comment hi def link 2 PreProc ! let set = [{"group": 1, "pattern": 2, "id": 3, "priority": 4}] ! let exp = [{"group": '1', "pattern": '2', "id": 3, "priority": 4}] ! if has('conceal') ! let set[0]['conceal'] = 5 ! let exp[0]['conceal'] = '5' ! endif call setmatches(set) call assert_equal(exp, getmatches()) endfunc *** ../vim-7.4.2160/src/version.c 2016-08-05 22:22:02.559334887 +0200 --- src/version.c 2016-08-05 22:50:55.653272125 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2161, /**/ -- DENNIS: You can't expect to wield supreme executive power just 'cause some watery tart threw a sword at you! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///