From 6a042e539d00def8cccd0e2aed6f9f681949dc66 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Mon, 20 Oct 2008 23:09:54 +0000
Subject: [PATCH] * fixed some muttator warnings * temp. moved "gm" to "g."
 since "gm" is taken in muttator already

---
 Donators             |  1 +
 content/events.js    |  2 +-
 content/liberator.js |  5 +++++
 content/ui.js        | 12 +++++++++---
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Donators b/Donators
index 3b696e08..dcc8f653 100644
--- a/Donators
+++ b/Donators
@@ -3,6 +3,7 @@
 Also drop me a note, if you want the donated amount to be displayed.
 
 2008:
+* Mats Vestin
 * Berni Joss
 * Peter Rufer
 * Yann Le Du 
diff --git a/content/events.js b/content/events.js
index 5e29e75d..0769f283 100644
--- a/content/events.js
+++ b/content/events.js
@@ -497,7 +497,7 @@ function Events() //{{{
             let title = doc.title;
 
             // update history
-            if (url && history)
+            if (url && liberator.has("history"))
                 history.add(url, title);
 
             // mark the buffer as loaded, we can't use buffer.loaded
diff --git a/content/liberator.js b/content/liberator.js
index 214da768..1df057ef 100644
--- a/content/liberator.js
+++ b/content/liberator.js
@@ -91,9 +91,14 @@ const liberator = (function () //{{{
                     let classes = tabopts.filter(function (o) value.indexOf(o[0]) == -1)
                                          .map(function (a) a[3])
                     if (!classes.length)
+                    {
                         storage.styles.removeSheet("taboptions", null, null, null, true);
+                    }
                     else
+                    {
                         storage.styles.addSheet("taboptions", "chrome://*", classes.join(",") + "{ display: none; }", true, true);
+                        statusline.updateTabCount();
+                    }
 
                     return value;
                 },
diff --git a/content/ui.js b/content/ui.js
index 9801444e..9f0ecf15 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -456,7 +456,7 @@ function CommandLine() //{{{
     // FIXME: Should be "g<" but that doesn't work unless it has a non-null
     // rhs, getCandidates broken?
     mappings.add([modes.NORMAL],
-        ["gm"], "Redisplay the last command output",
+        ["g."], "Redisplay the last command output",
         function ()
         {
             if (lastMowOutput)
@@ -1615,8 +1615,14 @@ function StatusLine() //{{{
                 return;
             }
 
-            for (let [i, tab] in Iterator(Array.slice(getBrowser().mTabs)))
-                tab.setAttribute("ordinal", i + 1);
+            // update the ordinal which is used for numbered tabs only when the user has
+            // tab numbers set, and the host application supports it
+            if (config.hostApplication == "Firefox" &&
+                (options.get("guioptions").has("n") || options.get("guioptions").has("N")))
+            {
+                for (let [i, tab] in Iterator(Array.slice(getBrowser().mTabs)))
+                    tab.setAttribute("ordinal", i + 1);
+            }
 
             if (!currentIndex || typeof currentIndex != "number")
                 currentIndex = tabs.index() + 1;