From f0f477d48140581e5f02946f4d946902a7becaf8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 29 Dec 2013 23:36:23 +0800
Subject: [PATCH 01/66] Update to atom-shell v0.8.1.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 41e637599..7af47c8c1 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.7.6",
+  "atomShellVersion": "0.8.1",
   "dependencies": {
     "async": "0.2.6",
     "bootstrap": "git://github.com/benogle/bootstrap.git",

From 878eca30e9c1ef2d1ebb3abc072fd68e7d72b516 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 31 Dec 2013 09:35:11 +0800
Subject: [PATCH 02/66] Update node-nslog to v0.3.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7af47c8c1..e31657618 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "mkdirp": "0.3.5",
     "keytar": "0.13.0",
     "less-cache": "0.10.0",
-    "nslog": "0.1.0",
+    "nslog": "0.3.0",
     "oniguruma": "0.24.0",
     "optimist": "0.4.0",
     "pathwatcher": "0.11.0",

From b3ed9d468b6fa8d119b6e1523d1abef924cd223c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 31 Dec 2013 09:35:44 +0800
Subject: [PATCH 03/66] Update node-oniguruma to v0.25.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e31657618..e3e7bc392 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "keytar": "0.13.0",
     "less-cache": "0.10.0",
     "nslog": "0.3.0",
-    "oniguruma": "0.24.0",
+    "oniguruma": "0.25.0",
     "optimist": "0.4.0",
     "pathwatcher": "0.11.0",
     "pegjs": "0.7.0",

From 1dce2c439dd740b69f33fcf1fd613119e97cb9e7 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 31 Dec 2013 10:06:22 +0800
Subject: [PATCH 04/66] Update pathwatcher to v0.13.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e3e7bc392..d8e151643 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "nslog": "0.3.0",
     "oniguruma": "0.25.0",
     "optimist": "0.4.0",
-    "pathwatcher": "0.11.0",
+    "pathwatcher": "0.13.0",
     "pegjs": "0.7.0",
     "q": "0.9.7",
     "scandal": "0.9.0",

From 963aef70e8cdaa9f2ef42041bd9dfa76aafb9aaf Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 30 Dec 2013 10:35:28 +0800
Subject: [PATCH 05/66] Use atom-chrome31 branch of apm.

---
 vendor/apm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/apm b/vendor/apm
index 9343bd248..57c691dc4 160000
--- a/vendor/apm
+++ b/vendor/apm
@@ -1 +1 @@
-Subproject commit 9343bd248c08ed25a1018236a162b4aeeac5cf1d
+Subproject commit 57c691dc4e2152395ef043d6c137e633a7fb661a

From 033d85fd4fa6fa925e070d144723e9e985ee6a4d Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 31 Dec 2013 15:26:56 +0800
Subject: [PATCH 06/66] Update git-utils to v0.30.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d8e151643..ad0885d00 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "first-mate": "0.5.0",
     "fs-plus": "0.13.0",
     "fuzzaldrin": "0.1.0",
-    "git-utils": "0.29.0",
+    "git-utils": "0.30.0",
     "guid": "0.0.10",
     "jasmine-focused": "~0.15.0",
     "mkdirp": "0.3.5",

From 206db1c271a8803e75f548d85e48c1b64dd900bf Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jan 2014 10:38:30 +0800
Subject: [PATCH 07/66] Update scandal to v0.10.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ad0885d00..4bd10c4bf 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "pathwatcher": "0.13.0",
     "pegjs": "0.7.0",
     "q": "0.9.7",
-    "scandal": "0.9.0",
+    "scandal": "0.10.0",
     "season": "0.14.0",
     "semver": "1.1.4",
     "space-pen": "2.0.2",

From 7b5055f974047677796760da921158a32314f8d5 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jan 2014 10:39:36 +0800
Subject: [PATCH 08/66] Update apm.

---
 vendor/apm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/apm b/vendor/apm
index 57c691dc4..40d6ccced 160000
--- a/vendor/apm
+++ b/vendor/apm
@@ -1 +1 @@
-Subproject commit 57c691dc4e2152395ef043d6c137e633a7fb661a
+Subproject commit 40d6cccedf050e2f2a1651adf3f4df798ceaca0f

From e1248561b614e5d7d8519c67754c5a98943206fc Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jan 2014 10:44:10 +0800
Subject: [PATCH 09/66] Update keytar to v0.15.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4bd10c4bf..0ac5ff632 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "guid": "0.0.10",
     "jasmine-focused": "~0.15.0",
     "mkdirp": "0.3.5",
-    "keytar": "0.13.0",
+    "keytar": "0.15.0",
     "less-cache": "0.10.0",
     "nslog": "0.3.0",
     "oniguruma": "0.25.0",

From 441e179c486ee63b5c0076776f0e2f4a5711f556 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jan 2014 20:06:37 +0800
Subject: [PATCH 10/66] Update editor-stats to v0.10.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0ac5ff632..fc84c3d77 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "command-logger": "0.8.0",
     "command-palette": "0.14.0",
     "dev-live-reload": "0.20.0",
-    "editor-stats": "0.9.0",
+    "editor-stats": "0.10.0",
     "exception-reporting": "0.9.0",
     "feedback": "0.20.0",
     "find-and-replace": "0.63.0",

From 884d276458a66e4f0d5fc8b2dadea3c590201c47 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jan 2014 20:07:01 +0800
Subject: [PATCH 11/66] Update command-logger to v0.9.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fc84c3d77..e0fe2bcd7 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "background-tips": "0.1.0",
     "bookmarks": "0.15.0",
     "bracket-matcher": "0.15.0",
-    "command-logger": "0.8.0",
+    "command-logger": "0.9.0",
     "command-palette": "0.14.0",
     "dev-live-reload": "0.20.0",
     "editor-stats": "0.10.0",

From 9b48df928ccd00eae133d95a9a6e4b07831a434f Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jan 2014 20:33:52 +0800
Subject: [PATCH 12/66] Update gists to v0.14.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e0fe2bcd7..3286973c2 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "feedback": "0.20.0",
     "find-and-replace": "0.63.0",
     "fuzzy-finder": "0.28.0",
-    "gists": "0.13.0",
+    "gists": "0.14.0",
     "git-diff": "0.21.0",
     "github-sign-in": "0.15.0",
     "go-to-line": "0.12.0",

From 3ca3b23ef8d68a24c7707a701dc4eb7f14d219c3 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jan 2014 20:35:39 +0800
Subject: [PATCH 13/66] Update github-sign-in to v0.16.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3286973c2..170ba5779 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "fuzzy-finder": "0.28.0",
     "gists": "0.14.0",
     "git-diff": "0.21.0",
-    "github-sign-in": "0.15.0",
+    "github-sign-in": "0.16.0",
     "go-to-line": "0.12.0",
     "grammar-selector": "0.13.0",
     "image-view": "0.11.0",

From b4974eee410276aded8b6523cc4a2642e1c16c69 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jan 2014 20:50:43 +0800
Subject: [PATCH 14/66] Update spell-check to v0.19.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 170ba5779..5d3e1fe05 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "release-notes": "0.15.0",
     "settings-view": "0.52.0",
     "snippets": "0.17.0",
-    "spell-check": "0.17.0",
+    "spell-check": "0.19.0",
     "status-bar": "0.27.0",
     "styleguide": "0.19.0",
     "symbols-view": "0.27.0",

From 5ecbd024cf44e2349747942117fea8326b0d5199 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jan 2014 21:00:37 +0800
Subject: [PATCH 15/66] Update symbols-view to v0.28.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5d3e1fe05..a9430d447 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
     "spell-check": "0.19.0",
     "status-bar": "0.27.0",
     "styleguide": "0.19.0",
-    "symbols-view": "0.27.0",
+    "symbols-view": "0.28.0",
     "tabs": "0.16.0",
     "terminal": "0.23.0",
     "timecop": "0.11.0",

From 6942b82a7094884885a64087b2be99debc1847e1 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 6 Jan 2014 15:04:43 +0800
Subject: [PATCH 16/66] Update terminal to v0.24.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c4c7e89df..70dc2cf43 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "styleguide": "0.19.0",
     "symbols-view": "0.28.0",
     "tabs": "0.16.0",
-    "terminal": "0.23.0",
+    "terminal": "0.24.0",
     "timecop": "0.11.0",
     "to-the-hubs": "0.16.0",
     "tree-view": "0.53.0",

From d0bf7698961da70dcd1e541d5df95c235090b6c3 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 6 Jan 2014 16:31:04 +0800
Subject: [PATCH 17/66] Use node-vm-compatibility-layer module.

---
 build/Gruntfile.coffee | 4 ++++
 build/package.json     | 1 +
 2 files changed, 5 insertions(+)

diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee
index 831f18a15..720924a09 100644
--- a/build/Gruntfile.coffee
+++ b/build/Gruntfile.coffee
@@ -2,6 +2,10 @@ fs = require 'fs'
 path = require 'path'
 os = require 'os'
 
+# Add support for obselete APIs of vm module so we can make some third-party
+# modules work under node v0.11.x.
+require 'vm-compatibility-layer'
+
 fm = require 'json-front-matter'
 _ = require 'underscore-plus'
 
diff --git a/build/package.json b/build/package.json
index 221dc69c2..ceaeeddb8 100644
--- a/build/package.json
+++ b/build/package.json
@@ -28,6 +28,7 @@
     "request": "~2.27.0",
     "rimraf": "~2.2.2",
     "unzip": "~0.1.9",
+    "vm-compatibility-layer": "~0.1.0",
     "walkdir": "0.0.7"
   }
 }

From 28ec1f3e2db32e37308cf05f51e0ce20cb948133 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 6 Jan 2014 16:31:28 +0800
Subject: [PATCH 18/66] delegate.browserMainParts.preMainMessageLoopRun is
 discarded.

---
 src/browser/main.coffee | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/browser/main.coffee b/src/browser/main.coffee
index 3cef0f727..cd3c144f5 100644
--- a/src/browser/main.coffee
+++ b/src/browser/main.coffee
@@ -2,7 +2,6 @@ global.shellStartTime = Date.now()
 
 autoUpdater = require 'auto-updater'
 crashReporter = require 'crash-reporter'
-delegate = require 'atom-delegate'
 app = require 'app'
 fs = require 'fs'
 module = require 'module'
@@ -24,7 +23,7 @@ process.on 'uncaughtException', (error={}) ->
   nslog(error.message) if error.message?
   nslog(error.stack) if error.stack?
 
-delegate.browserMainParts.preMainMessageLoopRun = ->
+start = ->
   args = parseCommandLine()
 
   addPathToOpen = (event, pathToOpen) ->
@@ -122,3 +121,5 @@ parseCommandLine = ->
     resourcePath = path.dirname(path.dirname(__dirname))
 
   {resourcePath, pathsToOpen, executedFrom, test, version, pidToKillWhenClosed, devMode, newWindow, specDirectory, logFile}
+
+start()

From c287be1725bad33b5b47bfbeeecf16b406c150f6 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 6 Jan 2014 16:53:43 +0800
Subject: [PATCH 19/66] Fix bootstrap in renderer.

---
 static/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/static/index.html b/static/index.html
index d8df334f5..28ccf9b6c 100644
--- a/static/index.html
+++ b/static/index.html
@@ -5,10 +5,11 @@
 
   <script>
     window.onload = function() {
+      var path = require('path');
       var currentWindow = require('remote').getCurrentWindow();
       try {
         require('coffee-script');
-        require('../src/coffee-cache').register();
+        require(path.resolve(__dirname, '..', 'src', 'coffee-cache')).register();
         require(currentWindow.loadSettings.bootstrapScript);
         currentWindow.emit('window:loaded');
       }

From 72744494b83b0f842e082e31361c6033cd8193c2 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 6 Jan 2014 16:56:56 +0800
Subject: [PATCH 20/66] Also use node-vm-compatibility-layer in renderer.

---
 package.json      | 3 ++-
 static/index.html | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 70dc2cf43..7a47b47ef 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,8 @@
     "space-pen": "2.0.2",
     "telepath": "0.81.0",
     "temp": "0.5.0",
-    "underscore-plus": "0.6.1"
+    "underscore-plus": "0.6.1",
+    "vm-compatibility-layer": "0.1.0"
   },
   "packageDependencies": {
     "atom-dark-syntax": "0.10.0",
diff --git a/static/index.html b/static/index.html
index 28ccf9b6c..b35e779f0 100644
--- a/static/index.html
+++ b/static/index.html
@@ -8,6 +8,7 @@
       var path = require('path');
       var currentWindow = require('remote').getCurrentWindow();
       try {
+        require('vm-compatibility-layer');
         require('coffee-script');
         require(path.resolve(__dirname, '..', 'src', 'coffee-cache')).register();
         require(currentWindow.loadSettings.bootstrapScript);

From 196e908961a2b7809268ec60a1d9cb1adbeadd82 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 6 Jan 2014 20:30:29 +0800
Subject: [PATCH 21/66] Default window state should be empty object.

Setting default window state to empty string would cause the "Error
parsing window state" error in Atom.loadDocumentState.
---
 src/browser/atom-window.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee
index fab94b21b..9a15c251b 100644
--- a/src/browser/atom-window.coffee
+++ b/src/browser/atom-window.coffee
@@ -30,7 +30,7 @@ class AtomWindow
     @handleEvents()
 
     loadSettings = _.extend({}, settings)
-    loadSettings.windowState ?= ''
+    loadSettings.windowState ?= '{}'
 
     # Only send to the first non-spec window created
     if @constructor.includeShellLoadTime and not @isSpec

From f6a8b72fd4cb1d9711ce2ffea02ca2078b75fd8f Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 7 Jan 2014 09:32:49 +0800
Subject: [PATCH 22/66] Update node-oniguruma to v0.26.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7a47b47ef..13fa60333 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "keytar": "0.15.0",
     "less-cache": "0.10.0",
     "nslog": "0.3.0",
-    "oniguruma": "0.25.0",
+    "oniguruma": "0.26.0",
     "optimist": "0.4.0",
     "pathwatcher": "0.13.0",
     "pegjs": "0.7.0",

From bb65a1a47e78bc448accb851d758f7adb51da3c8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 7 Jan 2014 18:48:14 +0800
Subject: [PATCH 23/66] Update first-mate to v0.12.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 13fa60333..62e8ec53a 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "coffeestack": "0.6.0",
     "diff": "git://github.com/benogle/jsdiff.git",
     "emissary": "0.19.0",
-    "first-mate": "0.11.0",
+    "first-mate": "0.12.0",
     "fs-plus": "0.13.0",
     "fstream": "0.1.24",
     "fuzzaldrin": "0.1.0",

From 1144e52feacac6afe8dca402710574347693bf84 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 8 Jan 2014 08:55:26 +0800
Subject: [PATCH 24/66] Update atom-shell to v0.8.2.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 62e8ec53a..a46676f77 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.8.1",
+  "atomShellVersion": "0.8.2",
   "dependencies": {
     "async": "0.2.6",
     "bootstrap": "git://github.com/benogle/bootstrap.git",

From 02a9d11bb50311740673417142171abf3bf4e697 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 8 Jan 2014 09:01:07 +0800
Subject: [PATCH 25/66] Update first-mate to v0.13.0.

---
 build/package.json | 2 +-
 package.json       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/package.json b/build/package.json
index ceaeeddb8..5baf8e732 100644
--- a/build/package.json
+++ b/build/package.json
@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "biscotto": "0.0.17",
-    "first-mate": "~0.10.0",
+    "first-mate": "~0.13.0",
     "formidable": "~1.0.14",
     "github-releases": "~0.2.0",
     "grunt": "~0.4.1",
diff --git a/package.json b/package.json
index c50582fff..d79e0d1b2 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "coffeestack": "0.6.0",
     "diff": "git://github.com/benogle/jsdiff.git",
     "emissary": "0.19.0",
-    "first-mate": "0.12.0",
+    "first-mate": "0.13.0",
     "fs-plus": "0.14.0",
     "fstream": "0.1.24",
     "fuzzaldrin": "0.1.0",
@@ -51,7 +51,7 @@
     "temp": "0.5.0",
     "text-buffer": "0.9.0",
     "underscore-plus": "0.6.1",
-    "vm-compatibility-layer": "0.1.0"
+    "vm-compatibility-layer": "0.1.0",
     "theorist": "~0.7.0"
   },
   "packageDependencies": {

From 831454bd30a543727742df0af05d2f222be5d937 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 8 Jan 2014 12:11:35 +0800
Subject: [PATCH 26/66] Update atom-shell to v0.8.3.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d79e0d1b2..5bcdd81cf 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.8.2",
+  "atomShellVersion": "0.8.3",
   "dependencies": {
     "async": "0.2.6",
     "bootstrap": "git://github.com/benogle/bootstrap.git",

From efbd508163303867d5c09130e2ef60cce485a129 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 13 Jan 2014 17:31:03 +0800
Subject: [PATCH 27/66] Fix git specs when running under symbolic path.

---
 spec/git-spec.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/git-spec.coffee b/spec/git-spec.coffee
index 50e5f5cce..485d4dbbe 100644
--- a/spec/git-spec.coffee
+++ b/spec/git-spec.coffee
@@ -187,6 +187,7 @@ describe "Git", ->
       newPath = atom.project.resolve('git/working-dir/untracked.txt')
       cleanPath = atom.project.resolve('git/working-dir/other.txt')
       fs.writeFileSync(newPath, '')
+      newPath = fs.absolute newPath  # specs could be running under symbol path.
 
     afterEach ->
       fs.writeFileSync(modifiedPath, originalModifiedPathText)

From e29ffbea8c522429c0f351d7f87834aa667bf800 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 13 Jan 2014 23:26:05 +0800
Subject: [PATCH 28/66] Update to atom-shell v0.8.4.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e7806373b..852518566 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.8.3",
+  "atomShellVersion": "0.8.4",
   "dependencies": {
     "async": "0.2.6",
     "bootstrap": "git://github.com/benogle/bootstrap.git",

From 06ccb48efe28a93e4bc517c10d60e18472a5bdff Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Mon, 13 Jan 2014 15:40:17 -0800
Subject: [PATCH 29/66] Remove trailing }

---
 src/editor-view.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/editor-view.coffee b/src/editor-view.coffee
index 9ae326c54..ccf6d7919 100644
--- a/src/editor-view.coffee
+++ b/src/editor-view.coffee
@@ -1013,7 +1013,7 @@ class EditorView extends View
   #
   # fontSize - A {Number} indicating the font size in pixels.
   setFontSize: (fontSize) ->
-    @css('font-size', "#{fontSize}px}")
+    @css('font-size', "#{fontSize}px")
 
     @clearCharacterWidthCache()
 

From 5f92c6df6ca83fe2c5affcf886fad029bcf037b0 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 14 Jan 2014 20:00:47 +0800
Subject: [PATCH 30/66] Update atom-shell to v0.8.5.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 94f02cce8..d9611e672 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.8.4",
+  "atomShellVersion": "0.8.5",
   "dependencies": {
     "async": "0.2.6",
     "bootstrap": "git://github.com/benogle/bootstrap.git",

From 6401213510e6b053e352f68d473b046a4bb15d17 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 14 Jan 2014 20:39:16 +0800
Subject: [PATCH 31/66] Update apm.

---
 vendor/apm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/apm b/vendor/apm
index 40d6ccced..35edbb07f 160000
--- a/vendor/apm
+++ b/vendor/apm
@@ -1 +1 @@
-Subproject commit 40d6cccedf050e2f2a1651adf3f4df798ceaca0f
+Subproject commit 35edbb07fb4abba49dd97d12a1ad8c4adb71625f

From 46c5f097212ee35282020fa16faf99b819102298 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 14 Jan 2014 22:43:33 +0800
Subject: [PATCH 32/66] Update pathwatcher to v0.14.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d9611e672..c8a891c1c 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "nslog": "0.3.0",
     "oniguruma": "0.26.0",
     "optimist": "0.4.0",
-    "pathwatcher": "0.13.0",
+    "pathwatcher": "0.14.0",
     "pegjs": "0.8.0",
     "q": "0.9.7",
     "scandal": "0.11.0",

From 2023aeef97bf12c93fa1c109f7653f62eaf8e35d Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 14 Jan 2014 14:03:10 +0800
Subject: [PATCH 33/66] Use screen module to get screen's available size.

In Chrome31 the window.screen.availHeight and availWidth are sometimes
0, this is a workaround of this bug.
---
 src/atom.coffee | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/atom.coffee b/src/atom.coffee
index bab3cd0e6..4be78d895 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -4,6 +4,7 @@ keytar = require 'keytar'
 os = require 'os'
 path = require 'path'
 remote = require 'remote'
+screen = require 'screen'
 shell = require 'shell'
 dialog = remote.require 'dialog'
 app = remote.require 'app'
@@ -207,10 +208,11 @@ class Atom extends Model
 
   # Private:
   restoreWindowDimensions: ->
+    workAreaSize = screen.getPrimaryDisplay().workAreaSize
     windowDimensions = @state.windowDimensions ? {}
     {initialSize} = @getLoadSettings()
-    windowDimensions.height ?= initialSize?.height ? global.screen.availHeight
-    windowDimensions.width ?= initialSize?.width ? Math.min(global.screen.availWidth, 1024)
+    windowDimensions.height ?= initialSize?.height ? workAreaSize.height
+    windowDimensions.width ?= initialSize?.width ? Math.min(workAreaSize.width, 1024)
     @setWindowDimensions(windowDimensions)
 
   # Private:

From 94126942eb9ac18c08b8ed5f63312e96915cdb59 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 09:02:17 -0800
Subject: [PATCH 34/66] Upgrade to oniguruma@0.26.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3da9d2244..db1590c8f 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "less-cache": "0.10.0",
     "serializable": "0.3.0",
     "nslog": "0.1.0",
-    "oniguruma": "0.24.0",
+    "oniguruma": "0.26.0",
     "optimist": "0.4.0",
     "pathwatcher": "0.11.0",
     "pegjs": "0.8.0",

From eca9ba107c69cfbaa1ad3a4436f566d8e58e00a5 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 09:12:42 -0800
Subject: [PATCH 35/66] Upgrade to scandal@0.12.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index db1590c8f..5f59fde99 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "pathwatcher": "0.11.0",
     "pegjs": "0.8.0",
     "q": "0.9.7",
-    "scandal": "0.11.0",
+    "scandal": "0.12.0",
     "season": "0.14.0",
     "semver": "1.1.4",
     "space-pen": "3.1.0",

From fd1477fc92190e4b9ab72d5ce52ce1d812810fff Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 10:41:01 -0800
Subject: [PATCH 36/66] Only depend on jasmine-tagged

jasmine-tagged now depends on jasmine-focused and everything needed
should be reachable from just a dependency on jasmine-tagged.
---
 package.json               | 4 +---
 spec/jasmine-helper.coffee | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 5f59fde99..a4fba1a25 100644
--- a/package.json
+++ b/package.json
@@ -30,9 +30,7 @@
     "fuzzaldrin": "0.6.0",
     "git-utils": "0.29.0",
     "guid": "0.0.10",
-    "jasmine-focused": "~0.15.0",
-    "jasmine-node": "git://github.com/kevinsawicki/jasmine-node.git#short-stacks",
-    "jasmine-tagged": "0.2.0",
+    "jasmine-tagged": "0.3.0",
     "mkdirp": "0.3.5",
     "keytar": "0.13.0",
     "less-cache": "0.10.0",
diff --git a/spec/jasmine-helper.coffee b/spec/jasmine-helper.coffee
index c57a5dc37..5ff4ee868 100644
--- a/spec/jasmine-helper.coffee
+++ b/spec/jasmine-helper.coffee
@@ -4,8 +4,7 @@ module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) ->
   {$, $$} = require 'atom'
   window[key] = value for key, value of require '../vendor/jasmine'
 
-  require 'jasmine-focused'
-  require 'jasmine-tagged'
+  {TerminalReporter} = require 'jasmine-tagged'
 
   TimeReporter = require './time-reporter'
   timeReporter = new TimeReporter()
@@ -18,8 +17,7 @@ module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) ->
       process.stderr.write(str)
 
   if atom.getLoadSettings().exitWhenDone
-    {jasmineNode} = require 'jasmine-node/lib/jasmine-node/reporter'
-    reporter = new jasmineNode.TerminalReporter
+    reporter = new TerminalReporter
       print: (str) ->
         log(str)
       onComplete: (runner) ->

From 58cccd76a4f9c193b9a1194f10a2c9fe4d827164 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 11:10:39 -0800
Subject: [PATCH 37/66] Dedupe roaster when bootstrapping

---
 script/bootstrap | 1 +
 vendor/apm       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/bootstrap b/script/bootstrap
index 2154a1ef4..52bba9883 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -43,6 +43,7 @@ var commands = [
   echoNewLine,
   'node apm/node_modules/atom-package-manager/bin/apm clean ' + apmFlags,
   'node apm/node_modules/atom-package-manager/bin/apm install --quiet ' + apmFlags,
+  'node apm/node_modules/atom-package-manager/bin/apm dedupe --quiet ' + apmFlags + ' roaster',
 ];
 
 process.chdir(path.dirname(__dirname));
diff --git a/vendor/apm b/vendor/apm
index 9343bd248..9f993c48b 160000
--- a/vendor/apm
+++ b/vendor/apm
@@ -1 +1 @@
-Subproject commit 9343bd248c08ed25a1018236a162b4aeeac5cf1d
+Subproject commit 9f993c48b1ba3ccb9d8d1368286cccfbc079b618

From f86ca9b59ab82edbe2c826cbe445321e5ce0c843 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 12:39:05 -0800
Subject: [PATCH 38/66] :lipstick: Add array of packages to dedupe

---
 script/bootstrap | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/bootstrap b/script/bootstrap
index 52bba9883..3acdf9bf4 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -31,6 +31,7 @@ if (!fs.existsSync(path.join(apmInstallPath, 'node_modules')))
   fs.mkdirSync(path.join(apmInstallPath, 'node_modules'));
 
 var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? '--no-color' : '';
+var packagesToDedupe = ['roaster'];
 var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo';
 var commands = [
   'git submodule --quiet sync',
@@ -43,7 +44,7 @@ var commands = [
   echoNewLine,
   'node apm/node_modules/atom-package-manager/bin/apm clean ' + apmFlags,
   'node apm/node_modules/atom-package-manager/bin/apm install --quiet ' + apmFlags,
-  'node apm/node_modules/atom-package-manager/bin/apm dedupe --quiet ' + apmFlags + ' roaster',
+  'node apm/node_modules/atom-package-manager/bin/apm dedupe --quiet ' + apmFlags + ' ' + packagesToDedupe.join(' '),
 ];
 
 process.chdir(path.dirname(__dirname));

From d7d7bd2db568aacd063997a7ba0ba1f015e58818 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 12:49:32 -0800
Subject: [PATCH 39/66] Ignore less dist and test folders in build

---
 build/tasks/build-task.coffee | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee
index 1f95e76c4..4de3ff4e3 100644
--- a/build/tasks/build-task.coffee
+++ b/build/tasks/build-task.coffee
@@ -42,6 +42,8 @@ module.exports = (grunt) ->
     ignoredPaths = [
       path.join('git-utils', 'deps')
       path.join('oniguruma', 'deps')
+      path.join('less', 'dist')
+      path.join('less', 'test')
       path.join('vendor', 'apm')
       path.join('resources', 'mac')
       path.join('resources', 'win')

From 1814b187e9011bd57e448861f881b35667f19653 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 12:53:36 -0800
Subject: [PATCH 40/66] Don't copy bootstrap docs during build

---
 build/tasks/build-task.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee
index 4de3ff4e3..d639003f4 100644
--- a/build/tasks/build-task.coffee
+++ b/build/tasks/build-task.coffee
@@ -44,6 +44,7 @@ module.exports = (grunt) ->
       path.join('oniguruma', 'deps')
       path.join('less', 'dist')
       path.join('less', 'test')
+      path.join('bootstrap', 'docs')
       path.join('vendor', 'apm')
       path.join('resources', 'mac')
       path.join('resources', 'win')

From a93048d3aec6846300cf31cac17b3e75a08d81e5 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 12:58:34 -0800
Subject: [PATCH 41/66] Upgrade to language-php@0.3.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a4fba1a25..28bb0680a 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
     "language-objective-c": "0.2.0",
     "language-pegjs": "0.1.0",
     "language-perl": "0.2.0",
-    "language-php": "0.2.0",
+    "language-php": "0.3.0",
     "language-property-list": "0.2.0",
     "language-puppet": "0.2.0",
     "language-python": "0.2.0",

From a23561f9ce020a608a06462f7067fc028bbb57be Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 12:59:14 -0800
Subject: [PATCH 42/66] Upgrade to language-ruby@0.7.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 28bb0680a..9b7fba4f8 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
     "language-property-list": "0.2.0",
     "language-puppet": "0.2.0",
     "language-python": "0.2.0",
-    "language-ruby": "0.6.0",
+    "language-ruby": "0.7.0",
     "language-ruby-on-rails": "0.3.0",
     "language-sass": "0.3.0",
     "language-shellscript": "0.2.0",

From af95abe18595ee032405a272ea4882a86d33c45c Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 13:00:26 -0800
Subject: [PATCH 43/66] Upgrade to language-ruby-on-rails@0.4.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9b7fba4f8..8242509ff 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
     "language-puppet": "0.2.0",
     "language-python": "0.2.0",
     "language-ruby": "0.7.0",
-    "language-ruby-on-rails": "0.3.0",
+    "language-ruby-on-rails": "0.4.0",
     "language-sass": "0.3.0",
     "language-shellscript": "0.2.0",
     "language-source": "0.2.0",

From b1679a03d64a6c5c2245b9bfd45c96b95ef92376 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 13:08:57 -0800
Subject: [PATCH 44/66] Ignore spellchecker/vendor folder

---
 build/tasks/build-task.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee
index d639003f4..3b10394f2 100644
--- a/build/tasks/build-task.coffee
+++ b/build/tasks/build-task.coffee
@@ -45,6 +45,7 @@ module.exports = (grunt) ->
       path.join('less', 'dist')
       path.join('less', 'test')
       path.join('bootstrap', 'docs')
+      path.join('spellchecker', 'vendor')
       path.join('vendor', 'apm')
       path.join('resources', 'mac')
       path.join('resources', 'win')

From 0626df5cddf44d551ff6f4543802b1dc3f57f152 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 13:59:20 -0800
Subject: [PATCH 45/66] Use ignored paths in package filter

---
 build/tasks/build-task.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee
index 3b10394f2..8ccf7dda6 100644
--- a/build/tasks/build-task.coffee
+++ b/build/tasks/build-task.coffee
@@ -52,10 +52,11 @@ module.exports = (grunt) ->
     ]
     ignoredPaths = ignoredPaths.map (ignoredPath) -> "(#{ignoredPath})"
     nodeModulesFilter = new RegExp(ignoredPaths.join('|'))
+    packageFilter = new RegExp("(#{ignoredPaths.join('|')})|(.+\\.(cson|coffee)$)")
     for directory in nonPackageDirectories
       cp directory, path.join(appDir, directory), filter: nodeModulesFilter
     for directory in packageDirectories
-      cp directory, path.join(appDir, directory), filter: /.+\.(cson|coffee)$/
+      cp directory, path.join(appDir, directory), filter: packageFilter
 
     cp 'spec', path.join(appDir, 'spec')
     cp 'src', path.join(appDir, 'src'), filter: /.+\.(cson|coffee)$/

From ace61c330a9a32f163bfb95d32298fbb11facbdb Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 15:53:24 -0800
Subject: [PATCH 46/66] Upgrade to bracket-matcher@0.19.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3da9d2244..c077f7e27 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "autosave": "0.10.0",
     "background-tips": "0.4.0",
     "bookmarks": "0.16.0",
-    "bracket-matcher": "0.18.0",
+    "bracket-matcher": "0.19.0",
     "command-logger": "0.8.0",
     "command-palette": "0.14.0",
     "dev-live-reload": "0.22.0",

From b620be77803ea5ab738e7974689aeb12c08ab31e Mon Sep 17 00:00:00 2001
From: probablycorey <cj@github.com>
Date: Wed, 15 Jan 2014 15:58:52 -0800
Subject: [PATCH 47/66] Fix cut, copy and paste key bindings

Closes #1425
---
 src/editor-view.coffee | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/editor-view.coffee b/src/editor-view.coffee
index 7c2c34858..c39c8ee2e 100644
--- a/src/editor-view.coffee
+++ b/src/editor-view.coffee
@@ -128,9 +128,9 @@ class EditorView extends View
       'core:delete': => @editor.delete()
       'core:undo': => @editor.undo()
       'core:redo': => @editor.redo()
-      'core:cut': => @editor.cutSelection()
-      'core:copy': => @editor.copySelection()
-      'core:paste': => @editor.paste()
+      'core:cut': => @editor.cutSelectedText()
+      'core:copy': => @editor.copySelectedText()
+      'core:paste': => @editor.pasteText()
       'editor:move-to-previous-word': => @editor.moveCursorToPreviousWord()
       'editor:select-word': => @editor.selectWord()
       'editor:consolidate-selections': (event) => @consolidateSelections(event)

From c1022d15ba38d57e8d204b41bd2af803deede11a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 16:07:48 -0800
Subject: [PATCH 48/66] Use bootstrap fork from atom org.

This uses the fork branch which is v3.0.3 with @benogle's tooltip
commit cherry picked on top of it.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 393cefa0f..689bd4904 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "atomShellVersion": "0.7.6",
   "dependencies": {
     "async": "0.2.6",
-    "bootstrap": "git://github.com/benogle/bootstrap.git",
+    "bootstrap": "git://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
     "clear-cut": "0.2.0",
     "coffee-script": "1.6.3",
     "coffeestack": "0.6.0",

From 2dc8c9416516d2f023ce29f4dded01c3cf0428d1 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 16:17:50 -0800
Subject: [PATCH 49/66] Upgrade to git-utils@0.33.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 689bd4904..e8c7020c0 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "fs-plus": "0.14.0",
     "fstream": "0.1.24",
     "fuzzaldrin": "0.6.0",
-    "git-utils": "0.29.0",
+    "git-utils": "0.33.0",
     "guid": "0.0.10",
     "jasmine-tagged": "0.3.0",
     "mkdirp": "0.3.5",

From 2d04c5018437fd472853f7c8714b9c7d3af0d412 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 16:24:30 -0800
Subject: [PATCH 50/66] Dedupe oniguruma

---
 script/bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/bootstrap b/script/bootstrap
index 3acdf9bf4..8c0c8a99c 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -31,7 +31,7 @@ if (!fs.existsSync(path.join(apmInstallPath, 'node_modules')))
   fs.mkdirSync(path.join(apmInstallPath, 'node_modules'));
 
 var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? '--no-color' : '';
-var packagesToDedupe = ['roaster'];
+var packagesToDedupe = ['oniguruma', 'roaster'];
 var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo';
 var commands = [
   'git submodule --quiet sync',

From e2269d5d5196c9e72060576c1866a70862a13d83 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 16:36:07 -0800
Subject: [PATCH 51/66] Ignore xmldom test folder

---
 build/tasks/build-task.coffee | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee
index 8ccf7dda6..0e1d47e61 100644
--- a/build/tasks/build-task.coffee
+++ b/build/tasks/build-task.coffee
@@ -39,6 +39,8 @@ module.exports = (grunt) ->
       else
         nonPackageDirectories.push(directory)
 
+    # Put any paths here that shouldn't end up in the built Atom.app
+    # so that it doesn't becomes larger than it needs to be.
     ignoredPaths = [
       path.join('git-utils', 'deps')
       path.join('oniguruma', 'deps')
@@ -46,6 +48,7 @@ module.exports = (grunt) ->
       path.join('less', 'test')
       path.join('bootstrap', 'docs')
       path.join('spellchecker', 'vendor')
+      path.join('xmldom', 'test')
       path.join('vendor', 'apm')
       path.join('resources', 'mac')
       path.join('resources', 'win')

From 2430edbcb89854d3ceae5242b2a976a24dd67d68 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 16:38:52 -0800
Subject: [PATCH 52/66] Upgrade to command-logger@0.9.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e8c7020c0..a6d902db3 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "background-tips": "0.4.0",
     "bookmarks": "0.16.0",
     "bracket-matcher": "0.19.0",
-    "command-logger": "0.8.0",
+    "command-logger": "0.9.0",
     "command-palette": "0.14.0",
     "dev-live-reload": "0.22.0",
     "editor-stats": "0.12.0",

From 4122b5a43f77568ae68111f4aad124423e387a18 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 16:58:43 -0800
Subject: [PATCH 53/66] Dedupe nan module

---
 script/bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/bootstrap b/script/bootstrap
index 8c0c8a99c..d0c9919e0 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -31,7 +31,7 @@ if (!fs.existsSync(path.join(apmInstallPath, 'node_modules')))
   fs.mkdirSync(path.join(apmInstallPath, 'node_modules'));
 
 var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? '--no-color' : '';
-var packagesToDedupe = ['oniguruma', 'roaster'];
+var packagesToDedupe = ['nan', 'oniguruma', 'roaster'];
 var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo';
 var commands = [
   'git submodule --quiet sync',

From 276de1e5ae009d7a3c34c3b37cac00c59c85ce84 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 16 Jan 2014 09:30:59 +0800
Subject: [PATCH 54/66] Update pathwatcher to v0.14.1.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fa883f73a..ffd5c95fa 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nslog": "0.3.0",
     "oniguruma": "0.26.0",
     "optimist": "0.4.0",
-    "pathwatcher": "0.14.0",
+    "pathwatcher": "0.14.1",
     "pegjs": "0.8.0",
     "q": "0.9.7",
     "scandal": "0.12.0",

From 0b0a3ae4c29260872738f8f83b547066d5df565e Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 16 Jan 2014 09:37:23 +0800
Subject: [PATCH 55/66] Update pathwatcher to v0.14.2.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ffd5c95fa..920adf3a7 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nslog": "0.3.0",
     "oniguruma": "0.26.0",
     "optimist": "0.4.0",
-    "pathwatcher": "0.14.1",
+    "pathwatcher": "0.14.2",
     "pegjs": "0.8.0",
     "q": "0.9.7",
     "scandal": "0.12.0",

From 1006706cf6891928864a0eab539674684d8c34ab Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 17:42:17 -0800
Subject: [PATCH 56/66] Consistently order less cache import paths

---
 spec/theme-manager-spec.coffee |  4 ++--
 src/theme-manager.coffee       | 23 +++++++++++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/spec/theme-manager-spec.coffee b/spec/theme-manager-spec.coffee
index bb96a5b2a..cc49a19f1 100644
--- a/spec/theme-manager-spec.coffee
+++ b/spec/theme-manager-spec.coffee
@@ -38,8 +38,8 @@ describe "ThemeManager", ->
 
       # syntax theme is not a dir at this time, so only two.
       expect(paths.length).toBe 2
-      expect(paths[0]).toContain 'atom-dark-ui'
-      expect(paths[1]).toContain 'atom-light-ui'
+      expect(paths[0]).toContain 'atom-light-ui'
+      expect(paths[1]).toContain 'atom-dark-ui'
 
     it "ignores themes that cannot be resolved to a directory", ->
       atom.config.set('core.themes', ['definitely-not-a-theme'])
diff --git a/src/theme-manager.coffee b/src/theme-manager.coffee
index b34d07acf..6b1470e60 100644
--- a/src/theme-manager.coffee
+++ b/src/theme-manager.coffee
@@ -42,19 +42,26 @@ class ThemeManager
   # Internal-only: adhere to the PackageActivator interface
   activatePackages: (themePackages) -> @activateThemes()
 
+  # Private: Get the enabled theme names from the config.
+  #
+  # Returns an array of theme names in the order that they should be activated.
+  getEnabledThemeNames: ->
+    themeNames = atom.config.get('core.themes') ? []
+    themeNames = [themeNames] unless _.isArray(themeNames)
+
+    # Reverse so the first (top) theme is loaded after the others. We want
+    # the first/top theme to override later themes in the stack.
+    themeNames.reverse()
+
   # Internal-only:
   activateThemes: ->
     # atom.config.observe runs the callback once, then on subsequent changes.
-    atom.config.observe 'core.themes', (themeNames) =>
+    atom.config.observe 'core.themes', =>
       @deactivateThemes()
-      themeNames = [themeNames] unless _.isArray(themeNames)
-
-      # Reverse so the first (top) theme is loaded after the others. We want
-      # the first/top theme to override later themes in the stack.
-      themeNames = _.clone(themeNames).reverse()
 
       @refreshLessCache() # Update cache for packages in core.themes config
-      @packageManager.activatePackage(themeName) for themeName in themeNames
+      for themeName in @getEnabledThemeNames()
+        @packageManager.activatePackage(themeName)
 
       @refreshLessCache() # Update cache again now that @getActiveThemes() is populated
       @loadUserStylesheet()
@@ -85,7 +92,7 @@ class ThemeManager
       themePaths = (theme.getStylesheetsPath() for theme in activeThemes when theme)
     else
       themePaths = []
-      for themeName in atom.config.get('core.themes') ? []
+      for themeName in @getEnabledThemeNames()
         if themePath = @packageManager.resolvePackagePath(themeName)
           themePaths.push(path.join(themePath, AtomPackage.stylesheetsDir))
 

From 24f386df2d8056432f20502e34e4a1cf6730c749 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 17:54:06 -0800
Subject: [PATCH 57/66] Wait 30 seconds for move events

---
 spec/file-spec.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/file-spec.coffee b/spec/file-spec.coffee
index 41b711514..c2a93ffad 100644
--- a/spec/file-spec.coffee
+++ b/spec/file-spec.coffee
@@ -73,7 +73,7 @@ describe 'File', ->
 
         fs.moveSync(filePath, newPath)
 
-        waitsFor "move event", ->
+        waitsFor "move event", 30000, ->
           moveHandler.callCount > 0
 
         runs ->

From ceac8ba0e15b1f31e2c2e3c8025be34ee50637e0 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 15 Jan 2014 18:17:14 -0800
Subject: [PATCH 58/66] Prepare 0.47.0 release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a6d902db3..0dd553e4d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.46.0",
+  "version": "0.47.0",
   "main": "./src/browser/main.js",
   "repository": {
     "type": "git",

From ff9c9adeff18a9aad0f9d5da03fd00f5a6476e65 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Wed, 15 Jan 2014 19:26:22 -0700
Subject: [PATCH 59/66] Upgrade find-and-replace to 0.76.0 to fix result marker
 updates

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0dd553e4d..08f11251e 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "editor-stats": "0.12.0",
     "exception-reporting": "0.11.0",
     "feedback": "0.22.0",
-    "find-and-replace": "0.75.0",
+    "find-and-replace": "0.76.0",
     "fuzzy-finder": "0.31.0",
     "gists": "0.15.0",
     "git-diff": "0.22.0",

From 910469d373231cb5e233c7f0deb978346facd3c7 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Wed, 15 Jan 2014 20:20:00 -0700
Subject: [PATCH 60/66] Upgrade theorist to 0.14.0 to ensure new ids are > than
 deserialized ids

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 08f11251e..135a96ed8 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "temp": "0.5.0",
     "text-buffer": "0.13.0",
     "underscore-plus": "0.6.1",
-    "theorist": "~0.13.0",
+    "theorist": "~0.14.0",
     "delegato": "~0.4.0",
     "mixto": "~0.4.0",
     "property-accessors": "~0.1.0"

From 20e7fea3abb40d83d26dbdf6557cdc1253ada93a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 16 Jan 2014 20:21:11 +0800
Subject: [PATCH 61/66] Update scandal to v0.13.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 920adf3a7..753a46469 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "pathwatcher": "0.14.2",
     "pegjs": "0.8.0",
     "q": "0.9.7",
-    "scandal": "0.12.0",
+    "scandal": "0.13.0",
     "season": "0.14.0",
     "semver": "1.1.4",
     "space-pen": "3.1.0",

From 4265de2232c81511e078b734aad56e871e23429d Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 17 Jan 2014 00:12:48 +0800
Subject: [PATCH 62/66] Update markdown-preview to v0.25.1.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9a2c25ab4..052eeb5bd 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "grammar-selector": "0.17.0",
     "image-view": "0.15.0",
     "keybinding-resolver": "0.8.0",
-    "markdown-preview": "0.24.0",
+    "markdown-preview": "0.25.1",
     "metrics": "0.21.0",
     "package-generator": "0.24.0",
     "release-notes": "0.15.0",

From ad5c0f93ede3d5f1ee1b3e1a7fcdb80d14b200a5 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 17 Jan 2014 00:18:22 +0800
Subject: [PATCH 63/66] Update release-notes to v0.15.1.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 052eeb5bd..3824b4890 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "markdown-preview": "0.25.1",
     "metrics": "0.21.0",
     "package-generator": "0.24.0",
-    "release-notes": "0.15.0",
+    "release-notes": "0.15.1",
     "settings-view": "0.56.0",
     "snippets": "0.19.0",
     "spell-check": "0.20.0",

From 9ed0ded91ba77254afd5f7e4a52aa2189f32931b Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 17 Jan 2014 00:20:16 +0800
Subject: [PATCH 64/66] Update settings-view to v0.56.1.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3824b4890..a50600f4f 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "metrics": "0.21.0",
     "package-generator": "0.24.0",
     "release-notes": "0.15.1",
-    "settings-view": "0.56.0",
+    "settings-view": "0.56.1",
     "snippets": "0.19.0",
     "spell-check": "0.20.0",
     "status-bar": "0.32.0",

From 043a50012e9b3de4b3c0e5c1c945ab95c9fae8ab Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 17 Jan 2014 00:22:35 +0800
Subject: [PATCH 65/66] Update git-utils to v0.33.1.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a50600f4f..b7373b4ee 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "fs-plus": "0.14.0",
     "fstream": "0.1.24",
     "fuzzaldrin": "0.6.0",
-    "git-utils": "0.33.0",
+    "git-utils": "0.33.1",
     "guid": "0.0.10",
     "jasmine-tagged": "0.3.0",
     "mkdirp": "0.3.5",

From 6538ee47aab1273765e017e2243a35cebbe64b0f Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 17 Jan 2014 00:25:23 +0800
Subject: [PATCH 66/66] Update keytar to v0.15.1.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b7373b4ee..d9e77786b 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "guid": "0.0.10",
     "jasmine-tagged": "0.3.0",
     "mkdirp": "0.3.5",
-    "keytar": "0.15.0",
+    "keytar": "0.15.1",
     "less-cache": "0.10.0",
     "serializable": "0.3.0",
     "nslog": "0.3.0",