Remove references to services.debugger and services.charset.

common/locale/en-US/options.xml

@@ -1034,19 +1034,6 @@
     </description>
 </item>
 
-<item>
-    <tags>'nojsd' 'nojsdebugger'</tags>
-    <tags>'jsd' 'jsdebugger'</tags>
-    <spec>'jsdebugger' 'jsd'</spec>
-    <type>&option.jsdebugger.type;</type>
-    <default>&option.jsdebugger.default;</default>
-    <description>
-        <p>
-            Use the JavaScript debugger service for JavaScript completion.
-        </p>
-    </description>
-</item>
-
 <item>
     <tags>'jt' 'jumptags'</tags>
     <spec>'jumptags' 'jt'</spec>

common/modules/base.jsm

@@ -17,6 +17,7 @@ function module(url) {
 }
 
 var { XPCOMUtils } = module("resource://gre/modules/XPCOMUtils.jsm");
+var { OS, TextDecoder, TextEncoder } = module("resource://gre/modules/osfile.jsm");
 try {
     var ctypes = module("resource://gre/modules/ctypes.jsm");
 }
@@ -178,10 +179,13 @@ defineModule("base", {
         "Finished",
         "JSMLoader",
         "Module",
+        "OS",
         "RealSet",
         "Set",
         "Struct",
         "StructBase",
+        "TextEncoder",
+        "TextDecoder",
         "Timer",
         "UTF8",
         "XPCOM",

common/modules/javascript.jsm

@@ -879,20 +879,6 @@ var JavaScript = Module("javascript", {
 
         bind(["<C-b>", "<PageUp>"], "Scroll up half a page",
              function ({ self }) { self.repl.scrollVertical("pages", -1); });
-    },
-    options: function initOptions(dactyl, modules, window) {
-        modules.options.add(["jsdebugger", "jsd"],
-            "Enable the JavaScript debugger service for use in JavaScript completion",
-            "boolean", false, {
-                setter: function (value) {
-                    if (services.debugger.isOn != value)
-                        if (value)
-                            (services.debugger.asyncOn || services.debugger.on)(null);
-                        else
-                            services.debugger.off();
-                },
-                getter: function () services.debugger.isOn
-            });
     }
 });
 

common/modules/services.jsm

@@ -33,7 +33,6 @@ var Services = Module("Services", {
         this.add("bookmarks",           "@mozilla.org/browser/nav-bookmarks-service;1",     "nsINavBookmarksService");
         this.add("browserSearch",       "@mozilla.org/browser/search-service;1",            "nsIBrowserSearchService");
         this.add("cache",               "@mozilla.org/network/cache-service;1",             "nsICacheService");
-        this.add("charset",             "@mozilla.org/charset-converter-manager;1",         "nsICharsetConverterManager");
         this.add("chromeRegistry",      "@mozilla.org/chrome/chrome-registry;1",            "nsIXULChromeRegistry");
         this.add("clipboard",           "@mozilla.org/widget/clipboard;1",                  "nsIClipboard");
         this.add("clipboardHelper",     "@mozilla.org/widget/clipboardhelper;1",            "nsIClipboardHelper");
@@ -43,7 +42,6 @@ var Services = Module("Services", {
                                                                                              "nsIContentPrefService2"]);
         this.add("dactyl",              "@dactyl.googlecode.com/extra/utils",               "dactylIUtils");
         this.add("dactyl:",             this.PROTOCOL + "dactyl");
-        this.add("debugger",            "@mozilla.org/js/jsd/debugger-service;1",           "jsdIDebuggerService");
         this.add("directory",           "@mozilla.org/file/directory_service;1",            "nsIProperties");
         this.add("downloadManager",     "@mozilla.org/download-manager;1",                  "nsIDownloadManager");
         this.add("environment",         "@mozilla.org/process/environment;1",               "nsIEnvironment");

common/skin/dactyl.css

@@ -227,12 +227,13 @@ statusbarpanel {
 @-moz-document url(chrome://browser/content/browser.xul) {
 
 /* Fix ginormous Australis tabs. */
-[dactyl-australis=true] xul|tab.tabbrowser-tab .tab-background > * {
+[dactyl-australis=true] :-moz-any(xul|tab.tabbrowser-tab, .tabs-newtab-button)
+        .tab-background > * {
     min-height: 24px !important;
     max-height: 24px !important;
 }
 
-[dactyl-australis=true] xul|tab.tabbrowser-tab
+[dactyl-australis=true] :-moz-any(xul|tab.tabbrowser-tab, .tabs-newtab-button)
     .tab-background > :-moz-any(.tab-background-start, .tab-background-end)::after {
     background-size: 30px 24px !important;
     max-height: 24px !important;
@@ -241,6 +242,7 @@ statusbarpanel {
 
 [dactyl-australis=true] .tabbrowser-tabs {
     min-height: 0 !important;
+    max-height: 24px !important;
 }
 
 /* Fix stupid line... */

pentadactyl/NEWS

@@ -1,3 +1,6 @@
+1.2pre:
+    • Remove 'jsdebugger' option.
+
 1.1:
     • Vim runtime files:
       - renamed :mksyntax to :mkvimruntime which now generates