From 6027e3ef9e9221e849005d2f61b2056969348ce0 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Thu, 6 Nov 2008 08:43:51 +0000
Subject: [PATCH] unbreak muttator's completions again. I can't say if tab
 numbering in vimperator still works, as it didn't for me before this commit
 either.

---
 content/bindings.xml            | 19 ------------------
 content/tabs.js                 |  2 +-
 content/vimperator/bindings.xml | 34 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 20 deletions(-)
 create mode 100644 content/vimperator/bindings.xml

diff --git a/content/bindings.xml b/content/bindings.xml
index fe2d5a20..9c87bdc3 100644
--- a/content/bindings.xml
+++ b/content/bindings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE bindings [
-<!ENTITY % tabBrowserDTD SYSTEM "chrome://browser/locale/tabbrowser.dtd" >
-%tabBrowserDTD;
 <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
 %globalDTD;
 ]>
@@ -18,23 +16,6 @@
             <children/>
         </content>
     </binding>
-    <binding id="tab"
-             extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tab">
-        <content chromedir="&locale.dir;"
-                 closetabtext="&closeTab.label;">
-            <xul:stack class="liberator-tab-stack">
-                <xul:image xbl:inherits="validate,src=image" class="tab-icon-image hl-TabIcon"/>
-                <xul:vbox>
-                    <xul:spring flex="1"/>
-                    <xul:label xbl:inherits="value=ordinal" class="hl-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"/>
-        </content>
-    </binding>
     <binding id="compitem-td">
         <!-- No white space. The table is white-space: pre; :( -->
         <content><html:span class="td-strut"/><html:span class="td-span"><children/></html:span></content>
diff --git a/content/tabs.js b/content/tabs.js
index 399181e6..942bdadd 100644
--- a/content/tabs.js
+++ b/content/tabs.js
@@ -231,7 +231,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/bindings.xml#tab); }", true);
+            ".tabbrowser-tab { -moz-binding: url(chrome://liberator/content/vimperator/bindings.xml#tab); }", true);
 
     }
 
diff --git a/content/vimperator/bindings.xml b/content/vimperator/bindings.xml
new file mode 100644
index 00000000..2617806a
--- /dev/null
+++ b/content/vimperator/bindings.xml
@@ -0,0 +1,34 @@
+<?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: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"
+             extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tab">
+        <content chromedir="&locale.dir;"
+                 closetabtext="&closeTab.label;">
+            <xul:stack class="liberator-tab-stack">
+                <xul:image xbl:inherits="validate,src=image" class="tab-icon-image hl-TabIcon"/>
+                <xul:vbox>
+                    <xul:spring flex="1"/>
+                    <xul:label xbl:inherits="value=ordinal" class="hl-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"/>
+        </content>
+    </binding>
+</bindings>
+
+<!-- vim:se ft=xbl sw=4 sts=4 tw=0 et: -->