From a0edb92e16270db4aeddd27d1dd84e21859cb793 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Mon, 15 Sep 2014 14:33:11 -0600
Subject: [PATCH] Rename editor.softWrapped config option back to
 editor.softWrap

---
 docs/customizing-atom.md  | 2 +-
 spec/editor-spec.coffee   | 6 +++---
 src/display-buffer.coffee | 2 +-
 src/editor-view.coffee    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/customizing-atom.md b/docs/customizing-atom.md
index 0b86298d6..d83e960be 100644
--- a/docs/customizing-atom.md
+++ b/docs/customizing-atom.md
@@ -123,7 +123,7 @@ You can open this file in an editor from the _Atom > Open Your Config_ menu.
   - `showInvisibles`: Whether to render placeholders for invisible characters (defaults to `false`)
   - `showIndentGuide`: Show/hide indent indicators within the editor
   - `showLineNumbers`: Show/hide line numbers within the gutter
-  - `softWrapped`: Enable/disable soft wrapping of text within the editor
+  - `softWrap`: Enable/disable soft wrapping of text within the editor
   - `softWrapAtPreferredLineLength`: Enable/disable soft line wrapping at `preferredLineLength`
   - `tabLength`: Number of spaces within a tab (defaults to `2`)
 - `fuzzyFinder`
diff --git a/spec/editor-spec.coffee b/spec/editor-spec.coffee
index d54ff5598..6ff0aa304 100644
--- a/spec/editor-spec.coffee
+++ b/spec/editor-spec.coffee
@@ -98,11 +98,11 @@ describe "Editor", ->
       expect(editor2.isFoldedAtBufferRow(4)).not.toBe editor.isFoldedAtBufferRow(4)
 
   describe "config defaults", ->
-    it "uses the `editor.tabLength`, `editor.softWrapped`, and `editor.softTabs` config values", ->
+    it "uses the `editor.tabLength`, `editor.softWrap`, and `editor.softTabs` config values", ->
       editor1 = null
       editor2 = null
       atom.config.set('editor.tabLength', 4)
-      atom.config.set('editor.softWrapped', true)
+      atom.config.set('editor.softWrap', true)
       atom.config.set('editor.softTabs', false)
 
       waitsForPromise ->
@@ -114,7 +114,7 @@ describe "Editor", ->
         expect(editor1.getSoftTabs()).toBe false
 
         atom.config.set('editor.tabLength', 100)
-        atom.config.set('editor.softWrapped', false)
+        atom.config.set('editor.softWrap', false)
         atom.config.set('editor.softTabs', true)
 
       waitsForPromise ->
diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee
index a2c9817a3..c86324b35 100644
--- a/src/display-buffer.coffee
+++ b/src/display-buffer.coffee
@@ -45,7 +45,7 @@ class DisplayBuffer extends Model
 
     @emitter = new Emitter
 
-    @softWrapped ?= atom.config.get('editor.softWrapped') ? false
+    @softWrapped ?= atom.config.get('editor.softWrap') ? false
     @tokenizedBuffer ?= new TokenizedBuffer({tabLength, buffer, @invisibles})
     @buffer = @tokenizedBuffer.buffer
     @charWidthsByScope = {}
diff --git a/src/editor-view.coffee b/src/editor-view.coffee
index 7617567f6..e91d69caa 100644
--- a/src/editor-view.coffee
+++ b/src/editor-view.coffee
@@ -47,7 +47,7 @@ class EditorView extends View
     nonWordCharacters: "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?-"
     preferredLineLength: 80
     tabLength: 2
-    softWrapped: false
+    softWrap: false
     softTabs: true
     softWrapAtPreferredLineLength: false
     scrollSensitivity: 40