From fd4a93ad87a44c20542903f60c9c4d5e222ba05c Mon Sep 17 00:00:00 2001
From: chriseth <c@ethdev.com>
Date: Wed, 23 Sep 2015 16:53:12 +0200
Subject: [PATCH 1/2] Report errors without line numbers again.

---
 index.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index d2b418f82b..2e147eee43 100644
--- a/index.html
+++ b/index.html
@@ -407,12 +407,13 @@ input[readonly] {
         var detailsOpen = {};
 
         var renderError = function(message) {
-            var $output = $('#output').empty()
+            $('#output')
+                .empty()
+                .append($('<pre class="error"></pre>').text(message));
             var err = message.match(/^:([0-9]*):([0-9]*)/)
             if (err && err.length) {
                 var errLine = parseInt( err[1], 10 ) - 1;
                 var errCol = err[2] ? parseInt( err[2], 10 ) : 0;
-                $output.append($('<pre class="error"></pre>').text(message));
                 editor.getSession().setAnnotations([{
                     row: errLine,
                     column: errCol,

From 3f7274c1d8c4f1cc26d89bacb097e97e021db226 Mon Sep 17 00:00:00 2001
From: chriseth <c@ethdev.com>
Date: Wed, 23 Sep 2015 16:59:06 +0200
Subject: [PATCH 2/2] Show tx.origin.

---
 index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 2e147eee43..b42181f72a 100644
--- a/index.html
+++ b/index.html
@@ -262,9 +262,8 @@ input[readonly] {
             <h1>Solidity realtime<br/>compiler and runtime</h1>
             <div class="info">
                 <p>Version: <span id="version">(loading)</span><br/>
-                Execution environment does not connect to any node, everyhing is in-memory only.<br/>
-                <strong>Note:</strong> If Chrome/Chromium reports &quot;Uncaught JavaScript Exception&quot;,
-                enable the debug console (Ctrl+Shift+i) and reload.</p>
+		Execution environment does not connect to any node, everyhing is local and in memory only.<br/>
+		<code>tx.origin = <span id="txorigin"/></code></p>
             </div>
             <div id="optimizeBox">
                 <input id="editorWrap" type="checkbox"><label for="editorWrap">Text Wrap</label>
@@ -576,6 +575,7 @@ input[readonly] {
         var secretKey = '3cd7232cd6f3fc66a57a6bedc1a8ed6c228fff0a327e169c2bcc5e869ed49511'
         var publicKey = '0406cc661590d48ee972944b35ad13ff03c7876eae3fd191e8a2f77311b0a3c6613407b5005e63d7d8d76b89d5f900cde691497688bb281e07a5052ff61edebdc0'
         var address = ethUtil.pubToAddress(new Buffer(publicKey, 'hex'));
+        $('#txorigin').text('0x' + address.toString('hex'));
         var account = new EthVm.Account();
         account.balance = 'f00000000000000001';
         var nonce = 0;