From f17790a39a892c6dc970163a59ba9a09f2fe5a0b Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 5 Oct 2010 20:03:06 -0400
Subject: [PATCH] Give the Cmd* and Status* highlight groups slightly higher
 precedence than their unadorned variants.

---
 common/content/configbase.js | 18 ++++++++++++++++++
 common/modules/highlight.jsm |  8 +++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/common/content/configbase.js b/common/content/configbase.js
index 23a0d9ad..9da312b6 100644
--- a/common/content/configbase.js
+++ b/common/content/configbase.js
@@ -160,6 +160,24 @@ const ConfigBase = Class(ModuleBase, {
         Enabled      color: blue;
         Disabled     color: red;
 
+        // Hack to give these groups slightly higher precedence
+        // than their unadorned variants.
+        //
+        CmdNormal;[dactyl|highlight]
+        StatusNormal;[dactyl|highlight]
+        CmdErrorMsg;[dactyl|highlight]
+        StatusErrorMsg;[dactyl|highlight]
+        CmdInfoMsg;[dactyl|highlight]
+        StatusInfoMsg;[dactyl|highlight]
+        CmdModeMsg;[dactyl|highlight]
+        StatusModeMsg;[dactyl|highlight]
+        CmdMoreMsg;[dactyl|highlight]
+        StatusMoreMsg;[dactyl|highlight]
+        CmdQuestion;[dactyl|highlight]
+        StatusQuestion;[dactyl|highlight]
+        CmdWarningMsg;[dactyl|highlight]
+        StatusWarningMsg;[dactyl|highlight]
+
         !Normal           color: black   !important; background: white   !important; font-weight: normal !important;
         !StatusNormal     color: inherit !important; background: inherit !important;
         ErrorMsg          color: white   !important; background: red     !important; font-weight: bold !important;
diff --git a/common/modules/highlight.jsm b/common/modules/highlight.jsm
index 82f0a1b4..737714a3 100644
--- a/common/modules/highlight.jsm
+++ b/common/modules/highlight.jsm
@@ -73,11 +73,13 @@ const Highlights = Module("Highlight", {
         let old = this.highlight[obj.class];
         this.highlight[obj.class] = obj;
         // This *must* come before any other property changes.
-        if (old)
+        if (old) {
+            obj.selector = old.selector;
             obj.style = old.style;
+        }
 
-        if (/^[>+ ]/.test(obj.selector))
-            obj.selector = this.selector(obj.class) + obj.selector;
+        if (/^[[>+ ]/.test(args[1]))
+            obj.selector = this.selector(obj.class) + args[1];
         if (old && old.value != old.default)
             obj.value = old.style;