aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-02-15 03:55:23 -0500
committerJustin M. Keyes <justinkz@gmail.com>2016-02-15 03:55:23 -0500
commitbaee9fe286fdcb9b04914feb8ab875c6143c2883 (patch)
treee43970514bd6a60c2c9ddba4852a099e73e9bbce /runtime
parent1e995ea2fd37f61ddf5496bfddf49b5ee0a527a8 (diff)
parentb137ebdd17cd3015fdb1123c2c1d9c54f37e8548 (diff)
downloadrneovim-baee9fe286fdcb9b04914feb8ab875c6143c2883.tar.gz
rneovim-baee9fe286fdcb9b04914feb8ab875c6143c2883.tar.bz2
rneovim-baee9fe286fdcb9b04914feb8ab875c6143c2883.zip
Merge pull request #4220 from watiko/vim-7.4.792
vim-patch:7.4.792
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/eval.txt13
1 files changed, 11 insertions, 2 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index a5f8660691..45980f5d94 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -4598,9 +4598,18 @@ matchadd({group}, {pattern}[, {priority}[, {id}]])
message will appear and the match will not be added. An ID
is specified as a positive integer (zero excluded). IDs 1, 2
and 3 are reserved for |:match|, |:2match| and |:3match|,
- respectively. If the {id} argument is not specified,
+ respectively. If the {id} argument is not specified or -1,
|matchadd()| automatically chooses a free ID.
+ The optional {dict} argmument allows for further custom
+ values. Currently this is used to specify a match specifc
+ conceal character that will be shown for |hl-Conceal|
+ highlighted matches. The dict can have the following members:
+
+ conceal Special character to show instead of the
+ match (only for |hl-Conceal| highlighed
+ matches, see |:syn-cchar|)
+
The number of matches is not limited, as it is the case with
the |:match| commands.
@@ -4614,7 +4623,7 @@ matchadd({group}, {pattern}[, {priority}[, {id}]])
available from |getmatches()|. All matches can be deleted in
one operation by |clearmatches()|.
-matchaddpos({group}, {pos}[, {priority}[, {id}]]) *matchaddpos()*
+matchaddpos({group}, {pos}[, {priority}[, {id}[, {dict}]]]) *matchaddpos()*
Same as |matchadd()|, but requires a list of positions {pos}
instead of a pattern. This command is faster than |matchadd()|
because it does not require to handle regular expressions and