github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ns-mb-detangle-editor

Browse Source
This commit is contained in:
Max Brunsfeld
2016-08-05 09:39:43 -07:00
parent 0a924a9e2f 62fa56e533
commit ddfb124cb8
23 changed files with 317 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/text-editor.coffee
View File

@@ -245,7 +245,8 @@ class TextEditor extends Model
tabLength: @getTabLength(),
ratioForCharacter: @ratioForCharacter.bind(this),
isWrapBoundary: isWrapBoundary,
foldCharacter: ZERO_WIDTH_NBSP
foldCharacter: ZERO_WIDTH_NBSP,
softWrapHangingIndent: @config.get('editor.softWrapHangingIndent', scope: @getRootScopeDescriptor())
})
destroyed: ->