From b4d2e52eecd64b981c094a885167c0253e6804e5 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 29 Nov 2008 13:22:15 +0000
Subject: [PATCH] Fix tab numbering.

---
 content/events.js               |  2 +-
 content/tabs.js                 |  2 +-
 content/vimperator/bindings.xml | 20 ++++++++------------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/content/events.js b/content/events.js
index 6aae9b72..e8c5b88a 100644
--- a/content/events.js
+++ b/content/events.js
@@ -717,7 +717,7 @@ function Events() //{{{
         function (args) { completion.listCompleter("macro", args[0]) },
         {
             argCount: "?",
-            completer: function (context) completion.macro(context),
+            completer: function (context) completion.macro(context)
         });
 
     commands.add(["pl[ay]"],
diff --git a/content/tabs.js b/content/tabs.js
index a0734561..25f4c942 100644
--- a/content/tabs.js
+++ b/content/tabs.js
@@ -221,7 +221,7 @@ function Tabs() //{{{
             });
         // TODO: Add option, or only apply when go~=[nN]
         styles.addSheet("tab-binding", "chrome://*",
-            ".tabbrowser-tab { -moz-binding: url(chrome://liberator/content/vimperator/bindings.xml#tab); }", true);
+            ".tabbrowser-tab { -moz-binding: url(chrome://liberator/content/vimperator/bindings.xml#tab) !important; }", true);
 
     }
 
diff --git a/content/vimperator/bindings.xml b/content/vimperator/bindings.xml
index 2617806a..b886e0f3 100644
--- a/content/vimperator/bindings.xml
+++ b/content/vimperator/bindings.xml
@@ -1,34 +1,30 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE bindings [
-<!ENTITY % tabBrowserDTD SYSTEM "chrome://browser/locale/tabbrowser.dtd" >
-%tabBrowserDTD;
 <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
 %globalDTD;
 ]>
 
 <bindings xmlns="http://www.mozilla.org/xbl"
+          xmlns:liberator="http://vimperator.org/namespaces/liberator"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	  xmlns:xbl="http://www.mozilla.org/xbl"
 	  xmlns:html="http://www.w3.org/1999/xhtml">
-
-    <binding id="tab"
+    <binding id="tab" display="xul:hbox"
              extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tab">
-        <content chromedir="&locale.dir;"
-                 closetabtext="&closeTab.label;">
+        <content chromedir="ltr" closetabtext="Close Tab">
             <xul:stack class="liberator-tab-stack">
-                <xul:image xbl:inherits="validate,src=image" class="tab-icon-image hl-TabIcon"/>
+                <xul:image xbl:inherits="validate,src=image" class="tab-icon-image" liberator:highlight="TabIcon"/>
                 <xul:vbox>
                     <xul:spring flex="1"/>
-                    <xul:label xbl:inherits="value=ordinal" class="hl-TabIconNumber"/>
+                    <xul:label xbl:inherits="value=ordinal" liberator:highlight="TabIconNumber"/>
                     <xul:spring flex="1"/>
                 </xul:vbox>
             </xul:stack>
-            <xul:label xbl:inherits="value=ordinal" class="hl-TabNumber"/>
-            <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" class="tab-text hl-TabText"/>
-            <xul:toolbarbutton anonid="close-button" tabindex="-1" class="tab-close-button hl-TabClose"/>
+            <xul:label xbl:inherits="value=ordinal" liberator:highlight="TabNumber"/>
+            <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" class="tab-text" liberator:highlight="TabText"/>
+            <xul:toolbarbutton anonid="close-button" tabindex="-1" class="tab-close-button" liberator:highlight="TabClose"/>
         </content>
     </binding>
 </bindings>
 
-<!-- vim:se ft=xbl sw=4 sts=4 tw=0 et: -->