diff --git a/common/content/autocommands.js b/common/content/autocommands.js index 919ab2a3..0237687c 100644 --- a/common/content/autocommands.js +++ b/common/content/autocommands.js @@ -31,10 +31,6 @@ const AutoCommands = Module("autocommands", { * @param {string} cmd The Ex command to run. */ add: function (events, regex, cmd) { - if (typeof events == "string") { - events = events.split(","); - dactyl.log("DEPRECATED: the events list arg to autocommands.add() should be an array of event names"); - } events.forEach(function (event) { this._store.push(AutoCommand(event, Option.parseRegex(regex), cmd)); }, this); diff --git a/common/content/io.js b/common/content/io.js index e2a4f660..d373120d 100644 --- a/common/content/io.js +++ b/common/content/io.js @@ -525,7 +525,7 @@ lookup: let file = io.File(filename); dactyl.assert(!file.exists() || args.bang, - "E189: " + filename.quote() + " exists (add ! to override)"); + "E189: " + filename.quote() + " exists (add ! to override)"); // TODO: Use a set/specifiable list here: let lines = [cmd.serialize().map(commands.commandToString) for (cmd in commands) if (cmd.serialize)]; diff --git a/common/contrib/fix_symlinks.py b/common/contrib/fix_symlinks.py index 6f4bdf28..82befccc 100644 --- a/common/contrib/fix_symlinks.py +++ b/common/contrib/fix_symlinks.py @@ -2,6 +2,7 @@ from mercurial import util import os def fix_symlinks(repo, hooktype, parent1, **kwargs): + print map(repr, (repo, hooktype, parent1, kwargs)) revert = hooktype in ('precommit', 'preupdate') ctxt = repo[parent1] for filename in ctxt: diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm index 4e8a743f..6b600872 100644 --- a/common/modules/sanitizer.jsm +++ b/common/modules/sanitizer.jsm @@ -130,7 +130,7 @@ const Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakR function ourItems(persistent) [ item for (item in self.itemMap) - if (!item.builtin && (!persistent || item.persistent)) + if (!item.builtin && (!persistent || item.persistent) && item.name !== "all") ]; function prefOverlay(branch, persistent, local) update(Object.create(local), {