To: vim_dev@googlegroups.com Subject: Patch 8.1.2296 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2296 Problem: Text properties are not combined with syntax by default. Solution: Make it work as documented. (closes #5190) Files: src/testprop.c, src/testdir/test_textprop.vim *** ../vim-8.1.2295/src/testdir/test_textprop.vim 2019-11-09 21:28:06.526103024 +0100 --- src/testdir/test_textprop.vim 2019-11-12 22:43:52.507605417 +0100 *************** *** 681,687 **** \ "call prop_type_add('background', {'highlight': 'BackgroundProp', 'combine': 0})", \ "call prop_type_add('backgroundcomb', {'highlight': 'NumberProp', 'combine': 1})", \ "eval 'backgroundcomb'->prop_type_change({'highlight': 'BackgroundProp'})", ! \ "call prop_type_add('error', {'highlight': 'UnderlineProp', 'combine': 1})", \ "call prop_add(1, 4, {'end_lnum': 3, 'end_col': 3, 'type': 'long'})", \ "call prop_add(2, 9, {'length': 3, 'type': 'number'})", \ "call prop_add(2, 24, {'length': 4, 'type': 'number'})", --- 681,687 ---- \ "call prop_type_add('background', {'highlight': 'BackgroundProp', 'combine': 0})", \ "call prop_type_add('backgroundcomb', {'highlight': 'NumberProp', 'combine': 1})", \ "eval 'backgroundcomb'->prop_type_change({'highlight': 'BackgroundProp'})", ! \ "call prop_type_add('error', {'highlight': 'UnderlineProp'})", \ "call prop_add(1, 4, {'end_lnum': 3, 'end_col': 3, 'type': 'long'})", \ "call prop_add(2, 9, {'length': 3, 'type': 'number'})", \ "call prop_add(2, 24, {'length': 4, 'type': 'number'})", *** ../vim-8.1.2295/src/version.c 2019-11-12 22:33:32.089004066 +0100 --- src/version.c 2019-11-12 22:41:08.140040889 +0100 *************** *** 743,744 **** --- 743,746 ---- { /* Add new patch number below this line */ + /**/ + 2296, /**/ -- hundred-and-one symptoms of being an internet addict: 82. AT&T names you Customer of the Month for the third consecutive time. /// 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 ///