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

[mirror_xterm.js.git] / src / SelectionManager.ts

diff --git a/src/SelectionManager.ts b/src/SelectionManager.ts
index a99cfa09234751e3f145e649c89519c442a7f7a1..189d73e826bc5e3e0167835930aac9ee74ae4f9a 100644 (file)
--- a/src/SelectionManager.ts
+++ b/src/SelectionManager.ts
@@ -43,7 +43,7 @@ const CLEAR_MOUSE_DISTANCE = 10;
  * A string containing all characters that are considered word separated by the
  * double click to select work logic.
  */
-const WORD_SEPARATORS = ' ()[]{}:\'"';
+const WORD_SEPARATORS = ' ()[]{}\'"';
 
 // TODO: Move these constants elsewhere, they belong in a buffer or buffer
 //       data/line class.
@@ -179,6 +179,7 @@ export class SelectionManager extends EventEmitter {
    */
   public setBuffer(buffer: CircularList<any>): void {
     this._buffer = buffer;
+    this.clearSelection();
   }
 
   public get selectionStart(): [number, number] { return this._model.finalSelectionStart; }
@@ -237,7 +238,7 @@ export class SelectionManager extends EventEmitter {
     // and joining the array into a multi-line string.
     const formattedResult = result.map(line => {
       return line.replace(ALL_NON_BREAKING_SPACE_REGEX, ' ');
-    }).join('\n');
+    }).join(Browser.isMSWindows ? '\r\n' : '\n');
 
     return formattedResult;
   }