On Tue, Nov 12, 2019 at 10:44:50PM +0100, Bram Moolenaar wrote:
> 
> 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

The changes to src/testprop.c are missing from the diff in this email,
and from the git commit as well.  (Possibly because the file is actually
named src/textprop.c.  Last change Nov 2, 2019.)

> *** ../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,
>   /**/
> 

Marius Gedminas
-- 
> find /lib/modules/2.4.17-expt/kernel/ -type f|while read i; do insmod $i; done
You're sick.  I like you.
        -- Andrew Morton on lkml

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/20191113071334.4bzwecgwozvidg3r%40blynas.

Attachment: signature.asc
Description: PGP signature

Raspunde prin e-mail lui