github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-16 17:45:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don’t use atom.config global in DisplayBuffer

Browse Source
This commit is contained in:
Nathan Sobo
2015-10-03 08:58:05 -06:00
parent 706ef8e8ce
commit edd666b845
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/text-editor.coffee
View File

@@ -66,7 +66,7 @@ class TextEditor extends Model
@deserialize: (state, atomEnvironment) ->
try
displayBuffer = DisplayBuffer.deserialize(state.displayBuffer)
displayBuffer = DisplayBuffer.deserialize(state.displayBuffer, atomEnvironment)
catch error
if error.syscall is 'read'
return # Error reading the file, don't deserialize an editor for it
@@ -103,7 +103,7 @@ class TextEditor extends Model
@selections = []
buffer ?= new TextBuffer
@displayBuffer ?= new DisplayBuffer({buffer, tabLength, softWrapped, ignoreInvisibles: @mini, largeFileMode})
@displayBuffer ?= new DisplayBuffer({buffer, tabLength, softWrapped, ignoreInvisibles: @mini, largeFileMode, @config})
@buffer = @displayBuffer.buffer
for marker in @findMarkers(@getSelectionMarkerAttributes())