Merge branch 'master' into as-cjk-soft-wrap

# Conflicts:
#	spec/display-buffer-spec.coffee

spec/text-editor-presenter-spec.coffee

@@ -18,7 +18,7 @@ describe "TextEditorPresenter", ->
       spyOn(window, "clearInterval").andCallFake window.fakeClearInterval
 
       buffer = new TextBuffer(filePath: require.resolve('./fixtures/sample.js'))
-      editor = new TextEditor({buffer})
+      editor = atom.workspace.buildTextEditor({buffer})
       waitsForPromise -> buffer.load()
 
     afterEach ->
@@ -40,6 +40,7 @@ describe "TextEditorPresenter", ->
         verticalScrollbarWidth: 10
         scrollTop: 0
         scrollLeft: 0
+        config: atom.config
 
       presenter = new TextEditorPresenter(params)
       presenter.setLinesYardstick(new FakeLinesYardstick(editor, presenter))
@@ -2860,7 +2861,7 @@ describe "TextEditorPresenter", ->
 
     performSetup = ->
       buffer = new TextBuffer
-      editor = new TextEditor({buffer})
+      editor = atom.workspace.buildTextEditor({buffer})
       editor.setEditorWidthInChars(80)
       presenterParams =
         model: editor