From 0734e9702226864e2dc590805feffb1b9c857533 Mon Sep 17 00:00:00 2001 From: Max Risuhin Date: Sat, 29 Jun 2019 15:21:37 +0300 Subject: [PATCH 1/3] Reset isWrapped line flag. --- src/WindowsMode.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/WindowsMode.ts b/src/WindowsMode.ts index d7b4bcaec..9afde6ff7 100644 --- a/src/WindowsMode.ts +++ b/src/WindowsMode.ts @@ -22,9 +22,7 @@ export function applyWindowsMode(terminal: ITerminal): IDisposable { const line = terminal.buffer.lines.get(terminal.buffer.ybase + terminal.buffer.y - 1); const lastChar = line.get(terminal.cols - 1); - if (lastChar[CHAR_DATA_CODE_INDEX] !== NULL_CELL_CODE && lastChar[CHAR_DATA_CODE_INDEX] !== WHITESPACE_CELL_CODE) { - const nextLine = terminal.buffer.lines.get(terminal.buffer.ybase + terminal.buffer.y); - nextLine.isWrapped = true; - } + const nextLine = terminal.buffer.lines.get(terminal.buffer.ybase + terminal.buffer.y); + nextLine.isWrapped = (lastChar[CHAR_DATA_CODE_INDEX] !== NULL_CELL_CODE && lastChar[CHAR_DATA_CODE_INDEX] !== WHITESPACE_CELL_CODE); }); } From c97972b9bb7adb91eb2efaf186c7ccf1893c9fc1 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 10 Jul 2019 11:37:18 -0700 Subject: [PATCH 2/3] Fix setTheme NPE in 3.14 Fixes #2220 --- src/Terminal.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Terminal.ts b/src/Terminal.ts index 67728cfbd..87a03bd2b 100644 --- a/src/Terminal.ts +++ b/src/Terminal.ts @@ -832,7 +832,9 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II */ private _setTheme(theme: ITheme): void { this._theme = theme; - this._colorManager.setTheme(theme); + if (this._colorManager) { + this._colorManager.setTheme(theme); + } if (this._renderCoordinator) { this._renderCoordinator.setColors(this._colorManager.colors); } From 8005272aa323b4c17daa8bbd3f42fcfcf7be8e1f Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 10 Jul 2019 11:37:36 -0700 Subject: [PATCH 3/3] v3.14.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03ee6ff7f..b0d59a501 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "xterm", "description": "Full xterm terminal, in your browser", - "version": "3.14.4", + "version": "3.14.5", "main": "lib/public/Terminal.js", "types": "typings/xterm.d.ts", "repository": "https://github.com/xtermjs/xterm.js",