Move highlighters into Scopes

That means we can now have highlighters active at global, buffer, and
window scope. The add-highlighter and remove-highlighter syntax changed
to take the parent path (scope/group/...) as a mandatory argument,
superseeding the previous -group switch.

11 files changed, 17 insertions, 17 deletions

diff --git a/test/highlight/column/multi-columns/rc b/test/highlight/column/multi-columns/rc
index 01eb14f6..79ac5c4b 100644
--- a/test/highlight/column/multi-columns/rc
+++ b/test/highlight/column/multi-columns/rc
@@ -1,5 +1,5 @@
-add-highlighter number_lines
+add-highlighter window number_lines
 set window tabstop 4
-add-highlighter column 3 default,red
-add-highlighter column 7 default,green
-add-highlighter column 5 default,blue
+add-highlighter window column 3 default,red
+add-highlighter window column 7 default,green
+add-highlighter window column 5 default,blue
diff --git a/test/highlight/regions/rc b/test/highlight/regions/rc
index b8c41521..580a5ae1 100644
--- a/test/highlight/regions/rc
+++ b/test/highlight/regions/rc
@@ -1,7 +1,7 @@
-add-highlighter regions -default code regions_test \
+add-highlighter window regions -default code regions_test \
     string %{"} %{(?<!\\)(\\\\)*"} '' \
     shell '\$\{' '\}' '\{'
 
-add-highlighter -group regions_test/code fill yellow
-add-highlighter -group regions_test/string fill green
-add-highlighter -group regions_test/shell fill red
+add-highlighter window/regions_test/code fill yellow
+add-highlighter window/regions_test/string fill green
+add-highlighter window/regions_test/shell fill red
diff --git a/test/highlight/wrap/avoid-odd-places/rc b/test/highlight/wrap/avoid-odd-places/rc
index 6f3644ff..374df4ac 100644
--- a/test/highlight/wrap/avoid-odd-places/rc
+++ b/test/highlight/wrap/avoid-odd-places/rc
@@ -1 +1 @@
-add-highlighter wrap -word
+add-highlighter window wrap -word
diff --git a/test/regression/1195-infinite-loop-in-regex-matching/rc b/test/regression/1195-infinite-loop-in-regex-matching/rc
index d13cd29c..d15eae97 100644
--- a/test/regression/1195-infinite-loop-in-regex-matching/rc
+++ b/test/regression/1195-infinite-loop-in-regex-matching/rc
@@ -1,2 +1,2 @@
-add-highlighter regions -default code -match-capture sh \
+add-highlighter window regions -default code -match-capture sh \
     heredoc '<<-?(\w+)' '^\t*(\w+)$' ''
diff --git a/test/regression/1275-replaced-range-split/cmd b/test/regression/1275-replaced-range-split/cmd
index 1e0db3c1..95930f55 100644
--- a/test/regression/1275-replaced-range-split/cmd
+++ b/test/regression/1275-replaced-range-split/cmd
@@ -1 +1 @@
-:addhl show_whitespaces<ret>i<space><esc>:addhl column 1 red<ret>A<backspace><esc>
+:addhl window show_whitespaces<ret>i<space><esc>:addhl window column 1 red<ret>A<backspace><esc>
diff --git a/test/regression/1382-column-highlighter-broken-on-horizontal-scroll/rc b/test/regression/1382-column-highlighter-broken-on-horizontal-scroll/rc
index 2a51f4a2..6e50cc1c 100644
--- a/test/regression/1382-column-highlighter-broken-on-horizontal-scroll/rc
+++ b/test/regression/1382-column-highlighter-broken-on-horizontal-scroll/rc
@@ -1 +1 @@
-add-highlighter column 20 default,blue
+add-highlighter window column 20 default,blue
diff --git a/test/regression/1433-scrolloff-broken-with-soft-wrap/rc b/test/regression/1433-scrolloff-broken-with-soft-wrap/rc
index 09fa1857..f241e60c 100644
--- a/test/regression/1433-scrolloff-broken-with-soft-wrap/rc
+++ b/test/regression/1433-scrolloff-broken-with-soft-wrap/rc
@@ -1,2 +1,2 @@
-add-highlighter wrap
+add-highlighter window wrap
 set global scrolloff 1,0
diff --git a/test/regression/1435-misplaced-cursor-with-show_matching-hl/rc b/test/regression/1435-misplaced-cursor-with-show_matching-hl/rc
index a0c5ad74..c70ba1f7 100644
--- a/test/regression/1435-misplaced-cursor-with-show_matching-hl/rc
+++ b/test/regression/1435-misplaced-cursor-with-show_matching-hl/rc
@@ -1 +1 @@
-add-highlighter show_whitespaces
+add-highlighter window show_whitespaces
diff --git a/test/regression/1453-show_whitespaces-highlighter-breaks-tab-alignment/rc b/test/regression/1453-show_whitespaces-highlighter-breaks-tab-alignment/rc
index a0c5ad74..c70ba1f7 100644
--- a/test/regression/1453-show_whitespaces-highlighter-breaks-tab-alignment/rc
+++ b/test/regression/1453-show_whitespaces-highlighter-breaks-tab-alignment/rc
@@ -1 +1 @@
-add-highlighter show_whitespaces
+add-highlighter window show_whitespaces
diff --git a/test/regression/1459-assertion-on-wrapped-long-line/rc b/test/regression/1459-assertion-on-wrapped-long-line/rc
index 030fe170..373ec148 100644
--- a/test/regression/1459-assertion-on-wrapped-long-line/rc
+++ b/test/regression/1459-assertion-on-wrapped-long-line/rc
@@ -1 +1 @@
-add-highlighter wrap
+add-highlighter window wrap
diff --git a/test/regression/638-highlight-codepoint-with-bracket/rc b/test/regression/638-highlight-codepoint-with-bracket/rc
index 2be17895..470a44e1 100644
--- a/test/regression/638-highlight-codepoint-with-bracket/rc
+++ b/test/regression/638-highlight-codepoint-with-bracket/rc
@@ -1 +1 @@
-add-highlighter regex '[“”]' 0:red
+add-highlighter window regex '[“”]' 0:red