From dd4b9346bbe9b4374963fc37805a83a076c1b3d0 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Wed, 30 Sep 2015 14:57:50 -0600
Subject: [PATCH] Deserialize grammar on editor window start

---
 src/atom.coffee | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/atom.coffee b/src/atom.coffee
index a150fef2c..31fa6a923 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -251,9 +251,6 @@ class Atom extends Model
   #
   # Call after this instance has been assigned to the `atom` global.
   initialize: ->
-    if grammarOverridesByPath = @state.grammars?.grammarOverridesByPath
-      @grammars.grammarOverridesByPath = grammarOverridesByPath
-
     @windowEventHandler = new WindowEventHandler
 
   ###
@@ -749,6 +746,9 @@ class Atom extends Model
     delete @state.packageStates
 
   deserializeEditorWindow: ->
+    if grammarOverridesByPath = @state.grammars?.grammarOverridesByPath
+      @grammars.grammarOverridesByPath = grammarOverridesByPath
+
     @deserializePackageStates()
     @deserializeProject()
     @deserializeWorkspace()