From 8be05589825a0854847e4593904c47d03ffee143 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Sat, 9 Oct 2010 21:45:52 +1100 Subject: Whitespace fixes. --- common/content/io.js | 1 - 1 file changed, 1 deletion(-) (limited to 'common/content/io.js') diff --git a/common/content/io.js b/common/content/io.js index efab3aa7..082904f9 100644 --- a/common/content/io.js +++ b/common/content/io.js @@ -67,7 +67,6 @@ const IO = Module("io", { services.get("downloadManager").addListener(this.downloadListener); }, - // TODO: there seems to be no way, short of a new component, to change // the process's CWD - see https://bugzilla.mozilla.org/show_bug.cgi?id=280953 /** -- cgit v1.2.3 From 15df81361d02ce178f918717d959d88a8c00a332 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Sat, 9 Oct 2010 13:10:41 -0400 Subject: Fix some double-printed errors on :source, and make :source! work properly for Ex files. --- common/content/io.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'common/content/io.js') diff --git a/common/content/io.js b/common/content/io.js index 082904f9..305023ed 100644 --- a/common/content/io.js +++ b/common/content/io.js @@ -391,9 +391,11 @@ lookup: dactyl.execute(line, { setFrom: file }); } catch (e) { - dactyl.echoerr("Error detected while processing " + file.path); - dactyl.echomsg("line\t" + this.sourcing.line + ":"); - dactyl.reportError(e, true); + if (!silent) { + dactyl.echoerr("Error detected while processing " + file.path); + dactyl.echomsg("line\t" + this.sourcing.line + ":"); + dactyl.reportError(e, true); + } } } } @@ -406,7 +408,8 @@ lookup: dactyl.log("Sourced: " + filename, 3); } catch (e) { - dactyl.reportError(e); + if (!(e instanceof FailedAssertion)) + dactyl.reportError(e); let message = "Sourcing file: " + (e.echoerr || file.path + ": " + e); if (!silent) dactyl.echoerr(message); -- cgit v1.2.3