Merge remote-tracking branch 'upstream/master' into 425_xon_xoff_on_280

This commit is contained in:
Daniel Imms 2017-01-08 17:05:19 -08:00
commit dddc91fbcc

View File

@ -1297,6 +1297,15 @@ Terminal.prototype.showCursor = function() {
Terminal.prototype.scroll = function() {
var row;
// Make room for the new row in lines
if (this.lines.length === this.lines.maxLength) {
this.lines.trimStart(1);
this.ybase--;
if (this.ydisp !== 0) {
this.ydisp--;
}
}
this.ybase++;
// TODO: Why is this done twice?
@ -1311,13 +1320,6 @@ Terminal.prototype.scroll = function() {
row -= this.rows - 1 - this.scrollBottom;
if (row === this.lines.length) {
// Compensate ybase and ydisp if lines has hit the maximum buffer size
if (this.lines.length === this.lines.maxLength) {
this.ybase--;
if (this.ydisp !== 0) {
this.ydisp--;
}
}
// Optimization: pushing is faster than splicing when they amount to the same behavior
this.lines.push(this.blankLine());
} else {