Revert "Revert "Merge pull request #4631""

This reverts commit dc2a453986.

Conflicts:
	spec/config-spec.coffee
	src/config.coffee
This commit is contained in:
Max Brunsfeld
2014-12-19 13:41:01 -08:00
parent 1cf8479831
commit a1b4820c04
12 changed files with 481 additions and 261 deletions

View File

@@ -647,7 +647,7 @@ class Workspace extends Model
# Restore to a default editor font size.
resetFontSize: ->
atom.config.restoreDefault("editor.fontSize")
atom.config.unset("editor.fontSize")
# Removes the item's uri from the list of potential items to reopen.
itemOpened: (item) ->