From 437cd802ebbb60ba5f901a588328670b19f835c3 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 1 Dec 2010 14:29:18 -0500
Subject: [PATCH] Don't treat <C-c> specially in pass-through mode. Closes
 issue #160.

--HG--
extra : rebase_source : 95b34d6df9705042fca26aeaf63f51d57131458b
---
 common/content/editor.js | 8 +++++---
 common/content/events.js | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/common/content/editor.js b/common/content/editor.js
index 06ff9fd4..78280152 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -317,8 +317,6 @@ const Editor = Module("editor", {
                 }
 
                 update(true);
-                if (textBox)
-                    textBox.removeAttribute("readonly");
 
             }, this);
             if (res == false)
@@ -328,9 +326,13 @@ const Editor = Module("editor", {
             // Errors are unlikely, and our error messages won't
             // likely be any more helpful than that given in the
             // exception.
-            dactyl.echoerr(e);
+            dactyl.reportError(e, true);
             tmpBg = "red";
         }
+        finally {
+            if (textBox)
+                textBox.removeAttribute("readonly");
+        }
 
         // blink the textbox after returning
         if (textBox) {
diff --git a/common/content/events.js b/common/content/events.js
index dbb0455d..a8f6243e 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -807,9 +807,6 @@ const Events = Module("events", {
                 });
         }
 
-        if (key == "<C-c>")
-            util.interrupted = true;
-
         // feedingKeys needs to be separate from interrupted so
         // we can differentiate between a recorded <C-c>
         // interrupting whatever it's started and a real <C-c>
@@ -862,6 +859,9 @@ const Events = Module("events", {
                 return null;
             }
 
+            if (key == "<C-c>")
+                util.interrupted = true;
+
             stop = true; // set to false if we should NOT consume this event but let the host app handle it
 
             // XXX: ugly hack for now pass certain keys to the host app as