summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2019-11-09 08:33:12 +1100
committerMaxime Coste <mawww@kakoune.org>2019-11-09 08:33:12 +1100
commitc11fc7ea741df7944f95b2ebda92504a82f98dc0 (patch)
treec23401f016d4876957c794609004e54c2a45a6f7
parent8e63aa1548d8158fbccd53ec64057027401e0505 (diff)
parentdb1d01342202059694a108023b3388432f91dfa8 (diff)
Merge remote-tracking branch 'Delapouite/WrapMarker'
-rw-r--r--doc/pages/changelog.asciidoc2
-rw-r--r--doc/pages/faces.asciidoc3
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/pages/changelog.asciidoc b/doc/pages/changelog.asciidoc
index 0cdcbf94..3312bc97 100644
--- a/doc/pages/changelog.asciidoc
+++ b/doc/pages/changelog.asciidoc
@@ -15,6 +15,8 @@ released versions.
* `-verbatim` switch in `evaluate-commands` for perfect command
forwarding to another context.
+* `WrapMarker` face used by `wrap -marker` highlighter
+
== Kakoune 2019.07.01
* Re-organized bundled script files directory hierarchy.
diff --git a/doc/pages/faces.asciidoc b/doc/pages/faces.asciidoc
index 2801bf81..973e37eb 100644
--- a/doc/pages/faces.asciidoc
+++ b/doc/pages/faces.asciidoc
@@ -136,6 +136,9 @@ The following faces are used by builtin highlighters if enabled.
*Whitespace*::
face used by the `show-whitespaces` highlighter
+*WrapMarker*::
+ face used by the `wrap -marker` highlighter
+
== Markup strings
In certain contexts, Kakoune can take a markup string, which is a string