Merge the "error" duplicate face into "Error"

8 files changed, 3 insertions, 10 deletions

diff --git a/colors/base16.kak b/colors/base16.kak
index 9b0d122e..bed2a10a 100644
--- a/colors/base16.kak
+++ b/colors/base16.kak
@@ -22,7 +22,6 @@
         face type ${orange_light}
         face identifier ${magenta_dark}
         face string ${green_dark}
-        face error ${grey_light},${magenta_light}
         face keyword ${purple_dark}+b
         face operator ${grey_light}
         face attribute ${orange_dark}
diff --git a/colors/default.kak b/colors/default.kak
index 925ba1b5..60581bad 100644
--- a/colors/default.kak
+++ b/colors/default.kak
@@ -5,7 +5,6 @@ face value red
 face type yellow
 face identifier green
 face string magenta
-face error default,red
 face keyword blue
 face operator yellow
 face attribute green
diff --git a/colors/github.kak b/colors/github.kak
index 736b19fa..b1a7c3b4 100644
--- a/colors/github.kak
+++ b/colors/github.kak
@@ -8,7 +8,6 @@ face value rgb:0086B3+b
 face type rgb:795DA3
 face identifier rgb:0086B3
 face string rgb:183691
-face error rgb:F8F8FF,rgb:BD2C00
 face keyword rgb:A71D5D+b
 face operator yellow
 face attribute rgb:A71D5D
diff --git a/colors/lucius.kak b/colors/lucius.kak
index 1205d003..84350c7e 100644
--- a/colors/lucius.kak
+++ b/colors/lucius.kak
@@ -28,7 +28,6 @@
         face type ${lucius_blue}
         face identifier ${lucius_green}
         face string ${lucius_light_green}
-        face error ${lucius_light_green}
         face keyword ${lucius_light_blue}
         face operator ${lucius_green}
         face attribute ${lucius_light_blue}
diff --git a/colors/reeder.kak b/colors/reeder.kak
index 02095e59..66752c83 100644
--- a/colors/reeder.kak
+++ b/colors/reeder.kak
@@ -26,7 +26,6 @@
         face type       ${orange}
         face identifier default
         face string     ${green}
-        face error      ${red},${grey_light}
         face keyword    ${brown_dark}
         face operator   default
         face attribute  ${green}
diff --git a/colors/solarized.kak b/colors/solarized.kak
index 01404e8a..fbea3542 100644
--- a/colors/solarized.kak
+++ b/colors/solarized.kak
@@ -26,7 +26,6 @@
         face type       ${yellow}
         face identifier ${blue}
         face string     ${cyan}
-        face error      ${base03},${red}
         face keyword    ${green}
         face operator   default
         face attribute  ${violet}
diff --git a/colors/zenburn.kak b/colors/zenburn.kak
index d21fb6fa..e87cb2d5 100644
--- a/colors/zenburn.kak
+++ b/colors/zenburn.kak
@@ -33,7 +33,6 @@
         face type ${zentype}
         face identifier ${zenidentifier}
         face string ${zenstring}
-        face error ${zenexception}
         face keyword ${zenkeyword}
         face operator ${zenfunction}
         face attribute ${zenstatement}
diff --git a/rc/core/kakrc.kak b/rc/core/kakrc.kak
index 9c54e807..d9931591 100644
--- a/rc/core/kakrc.kak
+++ b/rc/core/kakrc.kak
@@ -28,9 +28,9 @@ addhl -group / regions -default code kakrc \
 }
 
 addhl -group /kakrc/code regex \brgb:[0-9a-fA-F]{6}\b 0:value
-addhl -group /kakrc/code regex (?:\bhook)\h+(?:-group\h+\S+\h+)?(?:(global|buffer|window)|(\S+))\h+(\S+) 1:attribute 2:error 3:identifier
-addhl -group /kakrc/code regex (?:\bset)\h+(?:-add)?\h+(?:(global|buffer|window)|(\S+))\h+(\S+) 1:attribute 2:error 3:identifier
-addhl -group /kakrc/code regex (?:\bmap)\h+(?:(global|buffer|window)|(\S+))\h+(?:(normal|insert|menu|prompt|goto|view|user|object)|(\S+))\h+(\S+) 1:attribute 2:error 3:attribute 4:error 5:identifier
+addhl -group /kakrc/code regex (?:\bhook)\h+(?:-group\h+\S+\h+)?(?:(global|buffer|window)|(\S+))\h+(\S+) 1:attribute 2:Error 3:identifier
+addhl -group /kakrc/code regex (?:\bset)\h+(?:-add)?\h+(?:(global|buffer|window)|(\S+))\h+(\S+) 1:attribute 2:Error 3:identifier
+addhl -group /kakrc/code regex (?:\bmap)\h+(?:(global|buffer|window)|(\S+))\h+(?:(normal|insert|menu|prompt|goto|view|user|object)|(\S+))\h+(\S+) 1:attribute 2:Error 3:attribute 4:Error 5:identifier
 
 addhl -group /kakrc/double_string fill string
 addhl -group /kakrc/single_string fill string