Merge pull request #163 from jerch/fix_147_162

fixing #147 and #162

diff --cc src/xterm.js
index 15f071bccefb58d7f5f13c046ebb6bdeefc72d56,497f0a775f16d3e1c907ea96bb3cf5a6a1889e38..8633ff96e6c606ae2beec40ac5e6ec384dbe8970
--- 1/src/xterm.js
--- 2/src/xterm.js
+++ b/src/xterm.js
@@@ -1572,17 -1571,17 +1574,17 @@@
                    // insert combining char in last cell
                    // FIXME: needs handling after cursor jumps
                    if (!ch_width && this.x) {
 -                    
 +
                      // dont overflow left
-                     if (this.lines[this.y + this.ybase][this.x-1]) {
-                       if (!this.lines[this.y + this.ybase][this.x-1][2]) {
+                     if (this.lines[row][this.x-1]) {
+                       if (!this.lines[row][this.x-1][2]) {
  
                          // found empty cell after fullwidth, need to go 2 cells back
-                         if (this.lines[this.y + this.ybase][this.x-2])
-                           this.lines[this.y + this.ybase][this.x-2][1] += ch;
+                         if (this.lines[row][this.x-2])
+                           this.lines[row][this.x-2][1] += ch;
  
                        } else {
-                         this.lines[this.y + this.ybase][this.x-1][1] += ch;
+                         this.lines[row][this.x-1][1] += ch;
                        }
                        this.updateRange(this.y);
                      }