Merge remote-tracking branch 'origin/master' into cj-remember-last-window-dimensions

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.85.0",
+  "version": "0.86.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -12,7 +12,7 @@
     "url": "https://github.com/atom/atom/issues"
   },
   "license": "All Rights Reserved",
-  "atomShellVersion": "0.11.7",
+  "atomShellVersion": "0.11.8",
   "dependencies": {
     "async": "0.2.6",
     "atom-keymap": "^0.17.0",
@@ -23,7 +23,7 @@
     "delegato": "1.x",
     "emissary": "^1.2.1",
     "first-mate": "^1.5.1",
-    "fs-plus": "^2.2",
+    "fs-plus": "^2.2.1",
     "fstream": "0.1.24",
     "fuzzaldrin": "~1.1",
     "git-utils": "^1.2.2",
@@ -50,7 +50,7 @@
     "serializable": "1.x",
     "space-pen": "3.1.1",
     "temp": "0.5.0",
-    "text-buffer": "^1.4.6",
+    "text-buffer": "^2.0.1",
     "theorist": "1.x",
     "underscore-plus": "^1.1.2",
     "vm-compatibility-layer": "0.1.0"
@@ -59,7 +59,7 @@
     "atom-dark-syntax": "0.15.0",
     "atom-dark-ui": "0.26.0",
     "atom-light-syntax": "0.16.0",
-    "atom-light-ui": "0.23.0",
+    "atom-light-ui": "0.24.0",
     "base16-tomorrow-dark-theme": "0.13.0",
     "solarized-dark-syntax": "0.14.0",
     "solarized-light-syntax": "0.7.0",
@@ -74,22 +74,22 @@
     "dev-live-reload": "0.30.0",
     "exception-reporting": "0.17.0",
     "feedback": "0.29.0",
-    "find-and-replace": "0.95.0",
-    "fuzzy-finder": "0.46.0",
-    "git-diff": "0.27.0",
+    "find-and-replace": "0.97.0",
+    "fuzzy-finder": "0.47.0",
+    "git-diff": "0.28.0",
     "go-to-line": "0.19.0",
     "grammar-selector": "0.24.0",
     "image-view": "0.32.0",
-    "keybinding-resolver": "0.15.0",
+    "keybinding-resolver": "0.16.0",
     "link": "0.21.0",
-    "markdown-preview": "0.60.0",
+    "markdown-preview": "0.61.0",
     "metrics": "0.32.0",
-    "open-on-github": "0.26.0",
+    "open-on-github": "0.27.0",
     "package-generator": "0.30.0",
     "release-notes": "0.26.0",
     "settings-view": "0.107.0",
     "snippets": "0.40.0",
-    "spell-check": "0.32.0",
+    "spell-check": "0.33.0",
     "status-bar": "0.39.0",
     "styleguide": "0.28.0",
     "symbols-view": "0.49.0",
@@ -101,7 +101,7 @@
     "whitespace": "0.22.0",
     "wrap-guide": "0.18.0",
     "language-c": "0.14.0",
-    "language-coffee-script": "0.20.0",
+    "language-coffee-script": "0.22.0",
     "language-css": "0.13.0",
     "language-gfm": "0.31.0",
     "language-git": "0.9.0",
@@ -109,7 +109,7 @@
     "language-html": "0.19.0",
     "language-hyperlink": "0.9.0",
     "language-java": "0.9.0",
-    "language-javascript": "0.21.0",
+    "language-javascript": "0.22.0",
     "language-json": "0.8.0",
     "language-less": "0.6.0",
     "language-make": "0.10.0",

src/atom.coffee

@@ -454,7 +454,7 @@ class Atom extends Model
   exit: (status) ->
     app = remote.require('app')
     app.emit('will-exit')
-    app.exit(status)
+    remote.process.exit(status)
 
   # Public: Is the current window in development mode?
   inDevMode: ->

src/menu-manager.coffee

@@ -92,10 +92,10 @@ class MenuManager
   merge: (menu, item) ->
     item = _.deepClone(item)
 
-    if item.submenu? and match = _.find(menu, (i) => i.submenu? and @normalizeLabel(i.label) == @normalizeLabel(item.label))
+    if item.submenu? and match = _.find(menu, ({label, submenu}) => submenu? and label and @normalizeLabel(label) is @normalizeLabel(item.label))
       @merge(match.submenu, i) for i in item.submenu
     else
-      menu.push(item) unless _.find(menu, (i) => @normalizeLabel(i.label) == @normalizeLabel(item.label))
+      menu.push(item) unless _.find(menu, ({label}) => label and @normalizeLabel(label) is @normalizeLabel(item.label))
 
   # OSX can't handle displaying accelerators for multiple keystrokes.
   # If they are sent across, it will stop processing accelerators for the rest