diff --git a/common/content/commands.js b/common/content/commands.js index 7c29932d..0aae3402 100644 --- a/common/content/commands.js +++ b/common/content/commands.js @@ -426,6 +426,7 @@ const Commands = Module("commands", { */ execute: function (string, tokens, silent, args, sourcing) { io.withSavedValues(["readHeredoc", "sourcing"], function () { + sourcing = sourcing || { file: "[Command Line]", line: 1 }; this.sourcing = update({}, sourcing); args = update({ setFrom: this.sourcing.file }, args || {}); @@ -460,9 +461,13 @@ const Commands = Module("commands", { dactyl.execute(line, args); } catch (e) { - if (!silent) { - dactyl.echoerr("Error detected while processing " + this.sourcing.file); - dactyl.echomsg("line\t" + this.sourcing.line + ":"); + if (!silent || silent === "loud") { + if (silent !== "loud") + e.message = this.sourcing.file + ":" + this.sourcing.line + ": " + e.message; + else { + dactyl.echoerr("Error detected while processing " + this.sourcing.file); + dactyl.echomsg("line\t" + this.sourcing.line + ":"); + } dactyl.reportError(e, true); } } diff --git a/common/content/dactyl.js b/common/content/dactyl.js index 9aa3745e..e1bbe6b7 100644 --- a/common/content/dactyl.js +++ b/common/content/dactyl.js @@ -2013,7 +2013,7 @@ const Dactyl = Module("dactyl", { if (options["exrc"] && !dactyl.commandLineOptions.rcFile) { let localRCFile = io.getRCFile(io.cwd); if (localRCFile && !localRCFile.equals(rcFile)) - io.source(localRCFile.path, true); + io.source(localRCFile.path, false); } } diff --git a/common/content/events.js b/common/content/events.js index 75e5eb85..188e2dc7 100644 --- a/common/content/events.js +++ b/common/content/events.js @@ -741,8 +741,6 @@ const Events = Module("events", { function isEscape(key) key == "" || key == ""; function killEvent() { - if (/key|input/.test(event.type)) - util.dumpStack(); event.preventDefault(); event.stopPropagation(); } @@ -871,7 +869,6 @@ const Events = Module("events", { // only follow a map if there isn't a longer possible mapping // (allows you to do :map z yy, when zz is a longer mapping than z) else if (map && !event.skipmap && candidates.length == 0) { - util.dump(map, this._input); this._input.pendingMap = null; this._input.count = parseInt(countStr, 10); if (isNaN(this._input.count)) diff --git a/common/content/io.js b/common/content/io.js index 763f0e05..6e4361df 100644 --- a/common/content/io.js +++ b/common/content/io.js @@ -353,7 +353,7 @@ lookup: else if (/\.css$/.test(filename)) storage.styles.registerSheet(uri.spec, false, true); else { - commands.execute(file.read(), null, silent, null, + commands.execute(file.read(), null, silent || "loud", null, { file: file.path, line: 1 }); }