Merge branch 'master' into ns-workspace-custom-elements

spec/text-editor-spec.coffee

@@ -113,7 +113,7 @@ describe "TextEditor", ->
         expect(editor1.isSoftWrapped()).toBe true
         expect(editor1.getSoftTabs()).toBe false
 
-        atom.config.set('editor.tabLength', 100)
+        atom.config.set('editor.tabLength', 8)
         atom.config.set('editor.softWrap', false)
         atom.config.set('editor.softTabs', true)
 
@@ -121,7 +121,7 @@ describe "TextEditor", ->
         atom.workspace.open('b').then (o) -> editor2 = o
 
       runs ->
-        expect(editor2.getTabLength()).toBe 100
+        expect(editor2.getTabLength()).toBe 8
         expect(editor2.isSoftWrapped()).toBe false
         expect(editor2.getSoftTabs()).toBe true
 

src/config-schema.coffee

@@ -73,7 +73,7 @@ module.exports =
       tabLength:
         type: 'integer'
         default: 2
-        minimum: 1
+        enum: [1, 2, 4, 6, 8]
       softWrap:
         type: 'boolean'
         default: false
@@ -94,6 +94,7 @@ module.exports =
       useHardwareAcceleration:
         type: 'boolean'
         default: true
+        description: 'Disabling will improve editor font rendering but reduce scrolling performance.'
       confirmCheckoutHeadRevision:
         type: 'boolean'
         default: true

src/config.coffee

@@ -12,10 +12,10 @@ pathWatcher = require 'pathwatcher'
 #
 # An instance of this class is always available as the `atom.config` global.
 #
-# ## Getting and setting config settings. Note that with no value set, {::get}
-# returns the setting's default value.
+# ## Getting and setting config settings.
 #
 # ```coffee
+# # Note that with no value set, ::get returns the setting's default value.
 # atom.config.get('my-package.myKey') # -> 'defaultValue'
 #
 # atom.config.set('my-package.myKey', 'value')

src/text-editor-component.coffee

@@ -500,7 +500,7 @@ TextEditorComponent = React.createClass
         'editor:fold-at-indent-level-9': -> editor.foldAllAtIndentLevel(8)
         'editor:toggle-line-comments': -> editor.toggleLineCommentsInSelection()
         'editor:log-cursor-scope': -> editor.logCursorScope()
-        'editor:checkout-head-revision': -> atom.project.getRepositories()[0]()?.checkoutHeadForEditor(editor)
+        'editor:checkout-head-revision': -> atom.project.getRepositories()[0]?.checkoutHeadForEditor(editor)
         'editor:copy-path': -> editor.copyPathToClipboard()
         'editor:move-line-up': -> editor.moveLineUp()
         'editor:move-line-down': -> editor.moveLineDown()