From eb02e51e97efcc8789a4c7540737d67a70eb4184 Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian.jakobs@web.de>
Date: Wed, 8 Jun 2011 15:08:39 +0000
Subject: [PATCH] fix #280

---
 lib/ace/layer/text.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
index cc8906cd..da1a4cee 100644
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@@ -327,22 +327,21 @@ var Text = function(parentEl) {
         "lparen": true
     };
 
-    this.$renderToken = function(stringBuilder, screenColumn, token, value) {
+    this.$renderToken = function(stringBuilder, screenColumn, token, value) {        
         var self = this;
         var replaceReg = /\t|&|<|( +)|([\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000])|[\u1100-\u115F]|[\u11A3-\u11A7]|[\u11FA-\u11FF]|[\u2329-\u232A]|[\u2E80-\u2E99]|[\u2E9B-\u2EF3]|[\u2F00-\u2FD5]|[\u2FF0-\u2FFB]|[\u3000-\u303E]|[\u3041-\u3096]|[\u3099-\u30FF]|[\u3105-\u312D]|[\u3131-\u318E]|[\u3190-\u31BA]|[\u31C0-\u31E3]|[\u31F0-\u321E]|[\u3220-\u3247]|[\u3250-\u32FE]|[\u3300-\u4DBF]|[\u4E00-\uA48C]|[\uA490-\uA4C6]|[\uA960-\uA97C]|[\uAC00-\uD7A3]|[\uD7B0-\uD7C6]|[\uD7CB-\uD7FB]|[\uF900-\uFAFF]|[\uFE10-\uFE19]|[\uFE30-\uFE52]|[\uFE54-\uFE66]|[\uFE68-\uFE6B]|[\uFF01-\uFF60]|[\uFFE0-\uFFE6]/g;
         var replaceFunc = function(c, a, b, tabIdx, idx4) {
             if (c.charCodeAt(0) == 32) {
                 return new Array(c.length+1).join("&#160;");
             } else if (c == "\t") {
-                var tabSize = self.session.
-                        getScreenTabSize(screenColumn + tabIdx);
+                var tabSize = self.session.getScreenTabSize(screenColumn + tabIdx);
                 screenColumn += tabSize - 1;
                 return self.$tabStrings[tabSize];
             } else if (c == "&") {
-              if (useragent.isOldGecko)
-                return "&";
-              else
-                return "&amp";
+                if (useragent.isOldGecko)
+                    return "&";
+                else
+                    return "&amp;";
             } else if (c == "<") {
                 return "&lt;";
             } else if (c.match(/[\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000]/)) {
@@ -354,9 +353,9 @@ var Text = function(parentEl) {
                 }
             } else {
                 screenColumn += 1;
-                return "<span class='ace_cjk' style='width:" + (
-                        self.config.characterWidth * 2) +
-                        "px'>" + c + "</span>";
+                return "<span class='ace_cjk' style='width:" 
+                    + (self.config.characterWidth * 2)
+                    + "px'>" + c + "</span>";
             }
         }