From 9c372fa9bfbf067a650ebdc3421b329da2d14b96 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 19 Feb 2013 21:55:23 -0800
Subject: [PATCH] Load text package before deserializing path state

This is required for any editors that are deserialized
since a fallback grammar is always needed.
---
 src/app/atom.coffee   | 11 +++++++++--
 src/app/window.coffee |  4 +++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/app/atom.coffee b/src/app/atom.coffee
index de2bf680c..532dd558c 100644
--- a/src/app/atom.coffee
+++ b/src/app/atom.coffee
@@ -39,12 +39,19 @@ _.extend atom,
         packageStates[pack.name] = @atomPackageStates[pack.name]
     packageStates
 
+  loadTextPackage: ->
+    textPackagePath = _.find @getPackagePaths(), (path) -> fs.base(path) is 'text.tmbundle'
+    pack = Package.build(textPackagePath)
+    @loadedPackages.push(pack)
+    pack.load()
+
   loadPackages: ->
     textMatePackages = []
-    for path in @getPackagePaths()
+    paths = @getPackagePaths().filter (path) -> fs.base(path) isnt 'text.tmbundle'
+    for path in paths
       pack = Package.build(path)
       @loadedPackages.push(pack)
-      if pack instanceof TextMatePackage and fs.base(pack.path) isnt 'text.tmbundle'
+      if pack instanceof TextMatePackage
         textMatePackages.push(pack)
       else
         pack.load()
diff --git a/src/app/window.coffee b/src/app/window.coffee
index c946d7a63..97c0d9486 100644
--- a/src/app/window.coffee
+++ b/src/app/window.coffee
@@ -44,6 +44,7 @@ windowAdditions =
   startApplication: ->
     handleWindowEvents()
     config.load()
+    atom.loadTextPackage()
     buildProjectAndRootView()
     keymap.loadBundledKeymaps()
     atom.loadThemes()
@@ -59,7 +60,8 @@ windowAdditions =
     RootView = require 'root-view'
     Project = require 'project'
 
-    if windowState = atom.getRootViewStateForPath(atom.getPathToOpen()) and windowState?.project?
+    windowState = atom.getRootViewStateForPath(atom.getPathToOpen())
+    if windowState?.project?
       window.project = deserialize(windowState.project)
       window.rootView = deserialize(windowState.rootView)
     else