Merge remote-tracking branch 'origin/master' into 553_find_api

diff --cc src/SelectionManager.ts
index e2ba3756ed9a09d62884b1e0635a7a6ee1c486d5,9cfa53028f194a91736e30b7028b78c5a69557e9..930f09d1bc48f6b0b08a8affb84b020a72014ab0
--- 1/src/SelectionManager.ts
--- 2/src/SelectionManager.ts
+++ b/src/SelectionManager.ts
@@@ -184,12 -180,24 +184,24 @@@ export class SelectionManager extends E
  
      // Get middle rows
      for (let i = start[1] + 1; i <= end[1] - 1; i++) {
-       result.push(translateBufferLineToString(this._buffer.get(i), true));
+       const bufferLine = this._buffer.get(i);
 -      const lineText = this._translateBufferLineToString(bufferLine, true);
++      const lineText = translateBufferLineToString(bufferLine, true);
+       if (bufferLine.isWrapped) {
+         result[result.length - 1] += lineText;
+       } else {
+         result.push(lineText);
+       }
      }
  
      // Get final row
      if (start[1] !== end[1]) {
-       result.push(translateBufferLineToString(this._buffer.get(end[1]), true, 0, end[0]));
+       const bufferLine = this._buffer.get(end[1]);
 -      const lineText = this._translateBufferLineToString(bufferLine, true, 0, end[0]);
++      const lineText = translateBufferLineToString(bufferLine, true, 0, end[0]);
+       if (bufferLine.isWrapped) {
+         result[result.length - 1] += lineText;
+       } else {
+         result.push(lineText);
+       }
      }
  
      // Format string by replacing non-breaking space chars with regular spaces

diff --cc src/xterm.js
Simple merge