summaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-05 15:48:00 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-05 15:48:00 +0200
commitde24a8701328b1cce7cad0ee11b415369b482420 (patch)
tree9b5cef424fb7aafb173240dfc41e6d62afdeb3d0 /runtime
parentcf6a55c4b0cbf38b0c3fbed5ffd9a3fd0d2ede0e (diff)
downloadvim-git-de24a8701328b1cce7cad0ee11b415369b482420.tar.gz
patch 8.1.1276: cannot combine text properties with syntax highlightingv8.1.1276
Problem: Cannot combine text properties with syntax highlighting. Solution: Add the "combine" field to prop_type_add(). (closes #4343)
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/eval.txt3
-rw-r--r--runtime/doc/textprop.txt6
2 files changed, 8 insertions, 1 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index bc18daaca..e1ce00fa6 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -7218,6 +7218,9 @@ prop_type_add({name}, {props}) *prop_type_add()* *E969* *E970*
properties the one with the highest priority
will be used; negative values can be used, the
default priority is zero
+ combine when TRUE combine the highlight with any
+ syntax highlight; when omitted of FALSE syntax
+ highlight will not be used
start_incl when TRUE inserts at the start position will
be included in the text property
end_incl when TRUE inserts at the end position will be
diff --git a/runtime/doc/textprop.txt b/runtime/doc/textprop.txt
index 375255134..263c40eb1 100644
--- a/runtime/doc/textprop.txt
+++ b/runtime/doc/textprop.txt
@@ -1,4 +1,4 @@
-*textprop.txt* For Vim version 8.1. Last change: 2019 Jan 08
+*textprop.txt* For Vim version 8.1. Last change: 2019 May 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -57,6 +57,10 @@ Property Types ~
A text property normally has the name of a property type, which defines
how to highlight the text. The property type can have these entries:
"highlight" name of the highlight group to use
+ "combine" when TRUE the text property highlighting is combined
+ with any syntax highligting, when omitted or FALSE the
+ text property highlighting replaces the syntax
+ highlighting
"priority" when properties overlap, the one with the highest
priority will be used.
"start_incl" when TRUE inserts at the start position will be