Merge branch 'master' into ns-duplicate-multiple-lines

Conflicts:
	package.json

docs/your-first-package.md

@@ -20,7 +20,8 @@ The final package can be viewed at
 To begin, press `cmd-shift-P` to bring up the [Command
 Palette](https://github.com/atom/command-palette). Type "generate package" and
 select the "Package Generator: Generate Package" command. Now we need to name
-the package. Let's call it _ascii-art_.
+the package. Try to avoid naming your package with the *atom-* prefix, for
+example we are going to call this package _ascii-art_. 
 
 Atom will open a new window with the contents of our new _ascii-art_ package
 displayed in the Tree View. Because this window is opened **after** the package

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.68.0",
+  "version": "0.70.0",
   "main": "./src/browser/main.js",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
     "coffeestack": "0.7.0",
     "delegato": "1.x",
     "emissary": "1.x",
-    "first-mate": ">=1.2 <2.0",
+    "first-mate": ">=1.4 <2.0",
     "fs-plus": "2.x",
     "fstream": "0.1.24",
     "fuzzaldrin": "~1.1",
@@ -66,7 +66,7 @@
     "autosave": "0.12.0",
     "background-tips": "0.9.0",
     "bookmarks": "0.21.0",
-    "bracket-matcher": "0.24.0",
+    "bracket-matcher": "0.25.0",
     "command-palette": "0.19.0",
     "dev-live-reload": "0.28.0",
     "exception-reporting": "0.17.0",
@@ -75,7 +75,7 @@
     "fuzzy-finder": "0.39.0",
     "git-diff": "0.25.0",
     "go-to-line": "0.18.0",
-    "grammar-selector": "0.22.0",
+    "grammar-selector": "0.23.0",
     "image-view": "0.29.0",
     "keybinding-resolver": "0.11.0",
     "link": "0.20.0",
@@ -85,8 +85,8 @@
     "package-generator": "0.30.0",
     "release-notes": "0.26.0",
     "settings-view": "0.89.0",
-    "snippets": "0.34.0",
-    "spell-check": "0.27.0",
+    "snippets": "0.35.0",
+    "spell-check": "0.28.0",
     "status-bar": "0.35.0",
     "styleguide": "0.26.0",
     "symbols-view": "0.41.0",
@@ -96,17 +96,17 @@
     "update-package-dependencies": "0.6.0",
     "welcome": "0.11.0",
     "whitespace": "0.18.0",
-    "wrap-guide": "0.16.0",
+    "wrap-guide": "0.17.0",
     "language-c": "0.13.0",
     "language-coffee-script": "0.15.0",
-    "language-css": "0.12.0",
+    "language-css": "0.13.0",
     "language-gfm": "0.19.0",
     "language-git": "0.9.0",
     "language-go": "0.7.0",
-    "language-html": "0.10.0",
+    "language-html": "0.11.0",
     "language-hyperlink": "0.8.0",
-    "language-java": "0.8.0",
-    "language-javascript": "0.15.0",
+    "language-java": "0.9.0",
+    "language-javascript": "0.17.0",
     "language-json": "0.8.0",
     "language-less": "0.6.0",
     "language-make": "0.9.0",

src/browser/atom-application.coffee

@@ -30,7 +30,6 @@ socketPath =
 module.exports =
 class AtomApplication
   _.extend @prototype, EventEmitter.prototype
-  updateVersion: null
 
   # Public: The entry point into the Atom application.
   @open: (options) ->
@@ -130,6 +129,8 @@ class AtomApplication
 
   # Enable updates unless running from a local build of Atom.
   setupAutoUpdater: ->
+    return if /\w{7}/.test(@version) # Only released versions should check for updates.
+
     autoUpdater.setFeedUrl "https://atom.io/api/updates?version=#{@version}"
 
     autoUpdater.on 'checking-for-update', =>
@@ -143,10 +144,9 @@ class AtomApplication
     autoUpdater.on 'update-available', =>
       @applicationMenu.showDownloadingUpdateItem(true)
 
-    autoUpdater.on 'update-downloaded', (event, releaseNotes, releaseName, releaseDate, releaseURL) =>
-      atomWindow.sendCommand('window:update-available', [releaseName, releaseNotes]) for atomWindow in @windows
+    autoUpdater.on 'update-downloaded', (event, releaseNotes, releaseVersion, releaseDate, releaseURL) =>
+      atomWindow.sendCommand('window:update-available', [releaseVersion, releaseNotes]) for atomWindow in @windows
       @applicationMenu.showInstallUpdateItem(true)
-      @updateVersion = releaseName
 
     autoUpdater.on 'error', (event, message) =>
       @applicationMenu.showCheckForUpdateItem(true)
@@ -417,8 +417,3 @@ class AtomApplication
   promptForPath: ({devMode}={}) ->
     dialog.showOpenDialog title: 'Open', properties: ['openFile', 'openDirectory', 'multiSelections', 'createDirectory'], (pathsToOpen) =>
       @openPaths({pathsToOpen, devMode})
-
-  # Public: If an update is available, it returns the new version string
-  # otherwise it returns null.
-  getUpdateVersion: ->
-    @updateVersion

src/browser/atom-window.coffee

@@ -121,7 +121,6 @@ class AtomWindow
     if @loaded
       @focus()
       @sendCommand('window:open-path', {pathToOpen, initialLine})
-      @sendCommand('window:update-available', global.atomApplication.getUpdateVersion()) if global.atomApplication.getUpdateVersion()
     else
       @browserWindow.once 'window:loaded', => @openPath(pathToOpen, initialLine)