From b5fc710f1538aa8c53af190ad08de9fec7b0bcb0 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Tue, 6 Oct 2015 19:57:13 +0200
Subject: [PATCH] Don't use atom.clipboard global in Selection

---
 src/selection.coffee   | 8 ++++----
 src/text-editor.coffee | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/selection.coffee b/src/selection.coffee
index 80929cac7..2ba66ebb0 100644
--- a/src/selection.coffee
+++ b/src/selection.coffee
@@ -14,7 +14,7 @@ class Selection extends Model
   initialScreenRange: null
   wordwise: false
 
-  constructor: ({@cursor, @marker, @editor, id}) ->
+  constructor: ({@cursor, @marker, @editor, id, @clipboard}) ->
     @emitter = new Emitter
 
     @assignId(id)
@@ -611,7 +611,7 @@ class Selection extends Model
     startLevel = @editor.indentLevelForLine(precedingText)
 
     if maintainClipboard
-      {text: clipboardText, metadata} = atom.clipboard.readWithMetadata()
+      {text: clipboardText, metadata} = @clipboard.readWithMetadata()
       metadata ?= {}
       unless metadata.selections?
         metadata.selections = [{
@@ -624,9 +624,9 @@ class Selection extends Model
         indentBasis: startLevel,
         fullLine: fullLine
       })
-      atom.clipboard.write([clipboardText, selectionText].join("\n"), metadata)
+      @clipboard.write([clipboardText, selectionText].join("\n"), metadata)
     else
-      atom.clipboard.write(selectionText, {
+      @clipboard.write(selectionText, {
         indentBasis: startLevel,
         fullLine: fullLine
       })
diff --git a/src/text-editor.coffee b/src/text-editor.coffee
index c59cf1455..73afbfad7 100644
--- a/src/text-editor.coffee
+++ b/src/text-editor.coffee
@@ -2250,7 +2250,7 @@ class TextEditor extends Model
     unless marker.getProperties().preserveFolds
       @destroyFoldsContainingBufferRange(marker.getBufferRange())
     cursor = @addCursor(marker)
-    selection = new Selection(_.extend({editor: this, marker, cursor}, options))
+    selection = new Selection(_.extend({editor: this, marker, cursor, @clipboard}, options))
     @selections.push(selection)
     selectionBufferRange = selection.getBufferRange()
     @mergeIntersectingSelections(preserveFolds: marker.getProperties().preserveFolds)