Merge remote-tracking branch 'upstream/master' into 266_pull_renderer_out

src/test/escape-sequences-test.js

@@ -75,7 +75,7 @@ describe('xterm output comparison', function() {
 
   beforeEach(function () {
     xterm = new Terminal(COLS, ROWS);
-    xterm.refresh = function() {};
+    xterm.queueRefresh = function() {};
     xterm.viewport = {
       syncScrollArea: function() {}
     };

src/xterm.js

@@ -1909,14 +1909,14 @@ Terminal.prototype.nextStop = function(x) {
  * @param {number} y The line in which to operate.
  */
 Terminal.prototype.eraseRight = function(x, y) {
-  var line = this.lines.get(this.ybase + y)
-  , ch = [this.eraseAttr(), ' ', 1]; // xterm
-
-
+  var line = this.lines.get(this.ybase + y);
+  if (!line) {
+    return;
+  }
+  var ch = [this.eraseAttr(), ' ', 1]; // xterm
   for (; x < this.cols; x++) {
     line[x] = ch;
   }
-
   this.updateRange(y);
 };
 
@@ -1928,12 +1928,15 @@ Terminal.prototype.eraseRight = function(x, y) {
  * @param {number} y The line in which to operate.
  */
 Terminal.prototype.eraseLeft = function(x, y) {
-  var line = this.lines.get(this.ybase + y)
-  , ch = [this.eraseAttr(), ' ', 1]; // xterm
-
+  var line = this.lines.get(this.ybase + y);
+  if (!line) {
+    return;
+  }
+  var ch = [this.eraseAttr(), ' ', 1]; // xterm
   x++;
-  while (x--) line[x] = ch;
-
+  while (x--) {
+    line[x] = ch;
+  }
   this.updateRange(y);
 };