Rebase to github/master

spec/text-editor-spec.coffee

@@ -5918,12 +5918,3 @@ describe "TextEditor", ->
   describe "::getElement", ->
     it "returns an element", ->
       expect(editor.getElement() instanceof HTMLElement).toBe(true)
-
-  describe 'setMaxScreenLineLength', ->
-    it "sets the maximum line length in the editor before soft wrapping is forced", ->
-      expect(editor.maxScreenLineLength()).toBe 500
-      editor.update({
-        maxScreenLineLength: 1500
-      })
-      expect(editor.maxScreenLineLength()).toBe 1500
-

src/config-schema.js

@@ -409,12 +409,6 @@ const configSchema = {
         minimum: 1,
         description: 'Identifies the length of a line which is used when wrapping text with the `Soft Wrap At Preferred Line Length` setting enabled, in number of characters.'
       },
-      maxScreenLineLength: {
-        type: 'integer',
-        default: 500,
-        minimum: 500,
-        description: 'Defines the maximum width of the editor window before soft wrapping is enforced, in number of characters.'
-      },
       tabLength: {
         type: 'integer',
         default: 2,

src/text-editor-registry.js

@@ -18,7 +18,6 @@ const EDITOR_PARAMS_BY_SETTING_KEY = [
   ['editor.softWrapHangingIndent', 'softWrapHangingIndentLength'],
   ['editor.softWrapAtPreferredLineLength', 'softWrapAtPreferredLineLength'],
   ['editor.preferredLineLength', 'preferredLineLength'],
-  ['editor.maxScreenLineLength', 'maxScreenLineLength'],
   ['editor.autoIndent', 'autoIndent'],
   ['editor.autoIndentOnPaste', 'autoIndentOnPaste'],
   ['editor.scrollPastEnd', 'scrollPastEnd'],