Merge remote-tracking branch 'refs/remotes/origin/master' into wl-drewmnoel-electron

2026-01-24 14:28:14 -05:00 · 2016-04-12 17:32:07 -04:00
parent 2a9bc0fa12 db31d795e8
commit 3ecfce88ad
30 changed files with 1211 additions and 80 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -50,7 +50,7 @@ To get a sense for the packages that are bundled with Atom, you can go to Settin

 Here's a list of the big ones:

-* [atom/atom](https://github.com/atom/atom) - Atom Core! The core editor component is responsible for basic text editing (e.g. cursors, selections, scrolling), text indentation, wrapping, and folding, text rendering, editor rendering, file system operations (e.g. saving), and installation and auto-updating. You should also use this repository for feedback related to the [core API](https://atom.io/docs/api/latest/Notification) and for large, overarching design proposals.
+* [atom/atom](https://github.com/atom/atom) - Atom Core! The core editor component is responsible for basic text editing (e.g. cursors, selections, scrolling), text indentation, wrapping, and folding, text rendering, editor rendering, file system operations (e.g. saving), and installation and auto-updating. You should also use this repository for feedback related to the [core API](https://atom.io/docs/api/latest) and for large, overarching design proposals.
 * [tree-view](https://github.com/atom/tree-view) - file and directory listing on the left of the UI.
 * [fuzzy-finder](https://github.com/atom/fuzzy-finder) - the quick file opener.
 * [find-and-replace](https://github.com/atom/find-and-replace) - all search and replace functionality.
@@ -82,7 +82,7 @@ Before creating bug reports, please check [this list](#before-submitting-a-bug-r

 #### Before Submitting A Bug Report

-* **Check the [debugging guide](https://atom.io/docs/latest/hacking-atom-debugging).** You might be able to find the cause of the problem and fix things yourself. Most importantly, check if you can reproduce the problem [in the latest version of Atom](https://atom.io/docs/latest/hacking-atom-debugging#update-to-the-latest-version), if the problem happens when you run Atom in [safe mode](https://atom.io/docs/latest/hacking-atom-debugging#check-if-the-problem-shows-up-in-safe-mode), and if you can get the desired behavior by changing [Atom's or packages' config settings](https://atom.io/docs/latest/hacking-atom-debugging#check-atom-and-package-settings).
+* **Check the [debugging guide](http://flight-manual.atom.io/hacking-atom/sections/debugging/).** You might be able to find the cause of the problem and fix things yourself. Most importantly, check if you can reproduce the problem [in the latest version of Atom](http://flight-manual.atom.io/hacking-atom/sections/debugging/#update-to-the-latest-version), if the problem happens when you run Atom in [safe mode](http://flight-manual.atom.io/hacking-atom/sections/debugging/#check-if-the-problem-shows-up-in-safe-mode), and if you can get the desired behavior by changing [Atom's or packages' config settings](http://flight-manual.atom.io/hacking-atom/sections/debugging/#check-atom-and-package-settings).
 * **Check the [FAQs on the forum](https://discuss.atom.io/c/faq)** for a list of common questions and problems.
 * **Determine [which repository the problem should be reported in](#atom-and-packages)**.
 * **Perform a [cursory search](https://github.com/issues?q=+is%3Aissue+user%3Aatom)** to see if the problem has already been reported. If it has, add a comment to the existing issue instead of opening a new one.
@@ -100,13 +100,13 @@ Explain the problem and include additional details to help maintainers reproduce
 * **Explain which behavior you expected to see instead and why.**
 * **Include screenshots and animated GIFs** which show you following the described steps and clearly demonstrate the problem. If you use the keyboard while following the steps, **record the GIF with the [Keybinding Resolver](https://github.com/atom/keybinding-resolver) shown**. You can use [this tool](http://www.cockos.com/licecap/) to record GIFs on OSX and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux.
 * **If you're reporting that Atom crashed**, include a crash report with a stack trace from the operating system. On OSX, the crash report will be available in `Console.app` under "Diagnostic and usage information" > "User diagnostic reports". Include the crash report in the issue in a [code block](https://help.github.com/articles/markdown-basics/#multiple-lines), a [file attachment](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests/), or put it in a [gist](https://gist.github.com/) and provide link to that gist.
-* **If the problem is related to performance**, include a [CPU profile capture and a screenshot](https://atom.io/docs/latest/hacking-atom-debugging#diagnose-performance-problems-with-the-dev-tools-cpu-profiler) with your report.
+* **If the problem is related to performance**, include a [CPU profile capture and a screenshot](http://flight-manual.atom.io/hacking-atom/sections/debugging/#diagnose-performance-problems-with-the-dev-tools-cpu-profiler) with your report.
 * **If the Chrome's developer tools pane is shown without you triggering it**, that normally means that an exception was thrown. The Console tab will include an entry for the exception. Expand the exception so that the stack trace is visible, and provide the full exception and stack trace in a [code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines) and as a screenshot.
 * **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below.

 Provide more context by answering these questions:

-* **Can you reproduce the problem in [safe mode](https://atom.io/docs/latest/hacking-atom-debugging#check-if-the-problem-shows-up-in-safe-mode)?**
+* **Can you reproduce the problem in [safe mode](http://flight-manual.atom.io/hacking-atom/sections/debugging/#diagnose-runtime-performance-problems-with-the-dev-tools-cpu-profiler)?**
 * **Did the problem start happening recently** (e.g. after updating to a new version of Atom) or was this always a problem?
 * If the problem started happening recently, **can you reproduce the problem in an older version of Atom?** What's the most recent version in which the problem doesn't happen? You can download older versions of Atom from [the releases page](https://github.com/atom/atom/releases).
 * **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
@@ -118,7 +118,7 @@ Include details about your configuration and environment:
 * **What's the name and version of the OS you're using**?
 * **Are you running Atom in a virtual machine?** If so, which VM software are you using and which operating systems and versions are used for the host and the guest?
 * **Which [packages](#atom-and-packages) do you have installed?** You can get that list by running `apm list --installed`.
-* **Are you using [local configuration files](https://atom.io/docs/latest/using-atom-basic-customization)** `config.cson`, `keymap.cson`, `snippets.cson`, `styles.less` and `init.coffee` to customize Atom? If so, provide the contents of those files, preferably in a [code block](https://help.github.com/articles/markdown-basics/#multiple-lines) or with a link to a [gist](https://gist.github.com/).
+* **Are you using [local configuration files](http://flight-manual.atom.io/using-atom/sections/basic-customization/)** `config.cson`, `keymap.cson`, `snippets.cson`, `styles.less` and `init.coffee` to customize Atom? If so, provide the contents of those files, preferably in a [code block](https://help.github.com/articles/markdown-basics/#multiple-lines) or with a link to a [gist](https://gist.github.com/).
 * **Are you using Atom with multiple monitors?** If so, can you reproduce the problem when you use a single monitor?
 * **Which keyboard layout are you using?** Are you using a US layout or some other layout?

@@ -166,7 +166,7 @@ Before creating enhancement suggestions, please check [this list](#before-submit

 #### Before Submitting An Enhancement Suggestion

-* **Check the [debugging guide](https://atom.io/docs/latest/hacking-atom-debugging)** for tips — you might discover that the enhancement is already available. Most importantly, check if you're using [the latest version of Atom](https://atom.io/docs/latest/hacking-atom-debugging#update-to-the-latest-version) and if you can get the desired behavior by changing [Atom's or packages' config settings](https://atom.io/docs/latest/hacking-atom-debugging#check-atom-and-package-settings).
+* **Check the [debugging guide](http://flight-manual.atom.io/hacking-atom/sections/debugging/)** for tips — you might discover that the enhancement is already available. Most importantly, check if you're using [the latest version of Atom](http://flight-manual.atom.io/hacking-atom/sections/debugging/#update-to-the-latest-version) and if you can get the desired behavior by changing [Atom's or packages' config settings](http://flight-manual.atom.io/hacking-atom/sections/debugging/#check-atom-and-package-settings).
 * **Check if there's already [a package](https://atom.io/packages) which provides that enhancement.**
 * **Determine [which repository the enhancement should be suggested in](#atom-and-packages).**
 * **Perform a [cursory search](https://github.com/issues?q=+is%3Aissue+user%3Aatom)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
@@ -376,7 +376,7 @@ Please open an issue on `atom/atom` if you have suggestions for new labels, and
 | `windows` | [search][search-atom-repo-label-windows] | [search][search-atom-org-label-windows] | Related to Atom running on Windows. |
 | `linux` | [search][search-atom-repo-label-linux] | [search][search-atom-org-label-linux] | Related to Atom running on Linux. |
 | `mac` | [search][search-atom-repo-label-mac] | [search][search-atom-org-label-mac] | Related to Atom running on OSX. |
-| `documentation` | [search][search-atom-repo-label-documentation] | [search][search-atom-org-label-documentation] | Related to any type of documentation (e.g. [API documentation](https://atom.io/docs/api/latest/Atom) and the [flight manual](https://atom.io/docs/latest/)). |
+| `documentation` | [search][search-atom-repo-label-documentation] | [search][search-atom-org-label-documentation] | Related to any type of documentation (e.g. [API documentation](https://atom.io/docs/api/latest/) and the [flight manual](http://flight-manual.atom.io/)). |
 | `performance` | [search][search-atom-repo-label-performance] | [search][search-atom-org-label-performance] | Related to performance. |
 | `security` | [search][search-atom-repo-label-security] | [search][search-atom-org-label-security] | Related to security. |
 | `ui` | [search][search-atom-repo-label-ui] | [search][search-atom-org-label-ui] | Related to visual design. |
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -2,7 +2,7 @@

 * [ ] Can you reproduce the problem in [safe mode](http://flight-manual.atom.io/hacking-atom/sections/debugging/#check-if-the-problem-shows-up-in-safe-mode)?
 * [ ] Are you running the [latest version of Atom](http://flight-manual.atom.io/hacking-atom/sections/debugging/#update-to-the-latest-version)?
-* [ ] Did you check the [debugging guide](flight-manual.atom.io/hacking-atom/sections/debugging/)?
+* [ ] Did you check the [debugging guide](http://flight-manual.atom.io/hacking-atom/sections/debugging/)?
 * [ ] Did you check the [FAQs on Discuss](https://discuss.atom.io/c/faq)?
 * [ ] Are you reporting to the [correct repository](https://github.com/atom/atom/blob/master/CONTRIBUTING.md#atom-and-packages)?
 * [ ] Did you [perform a cursory search](https://github.com/issues?q=is%3Aissue+user%3Aatom+-repo%3Aatom%2Felectron) to see if your bug or enhancement is already reported?
--- a/README.md
+++ b/README.md
@@ -76,6 +76,22 @@ Currently only a 64-bit version is available.
 The Linux version does not currently automatically update so you will need to
 repeat these steps to upgrade to future releases.

+### Archive extraction
+
+An archive is available for people who don't want to install `atom` as root.
+
+This version enables you to install multiple Atom versions in parallel. It has been built on Ubuntu 64-bit,
+but should be compatible with other Linux distributions.
+
+1. Install dependencies (on Ubuntu): `sudo apt install git gconf2 gconf-service libgtk2.0-0 libudev1 libgcrypt20
+libnotify4 libxtst6 libnss3 python gvfs-bin xdg-utils libcap2`
+2. Download `atom-amd64.tar.gz` from the [Atom releases page](https://github.com/atom/atom/releases/latest).
+3. Run `tar xf atom-amd64.tar.gz` in the directory where you want to extract the Atom folder.
+4. Launch Atom using the installed `atom` command from the newly extracted directory.
+
+The Linux version does not currently automatically update so you will need to
+repeat these steps to upgrade to future releases.
+
 ## Building

 * [Linux](docs/build-instructions/linux.md)
--- a/build/Gruntfile.coffee
+++ b/build/Gruntfile.coffee
@@ -285,6 +285,7 @@ module.exports = (grunt) ->
  ciTasks.push('dump-symbols') if process.platform is 'darwin'
  ciTasks.push('set-version', 'check-licenses', 'lint', 'generate-asar')
  ciTasks.push('mkdeb') if process.platform is 'linux'
+  ciTasks.push('mktar') if process.platform is 'linux'
  ciTasks.push('codesign:exe') if process.platform is 'win32' and not process.env.CI
  ciTasks.push('create-windows-installer:installer') if process.platform is 'win32'
  ciTasks.push('test') if process.platform is 'darwin'
--- a/build/certs/AtomDevTestSignKey.p12
+++ b/build/certs/AtomDevTestSignKey.p12
--- a/build/tasks/codesign-task.coffee
+++ b/build/tasks/codesign-task.coffee
@@ -1,24 +1,46 @@
 path = require 'path'
+fs = require 'fs'
+request = require 'request'

 module.exports = (grunt) ->
  {spawn} = require('./task-helpers')(grunt)

+  signUsingWindowsSDK = (exeToSign, callback) ->
+    {WIN_P12KEY_PASSWORD, WIN_P12KEY_URL} = process.env
+    if WIN_P12KEY_URL?
+      grunt.log.ok("Obtaining signing key")
+      downloadedKeyFile = path.resolve(__dirname, 'DownloadedSignKey.p12')
+      downloadFile WIN_P12KEY_URL, downloadedKeyFile, (done) ->
+        signUsingWindowsSDKTool exeToSign, downloadedKeyFile, WIN_P12KEY_PASSWORD, (done) ->
+          fs.unlinkSync(downloadedKeyFile)
+          callback()
+    else
+      signUsingWindowsSDKTool exeToSign, path.resolve(__dirname, '..', 'certs', 'AtomDevTestSignKey.p12'), 'password', callback
+
+  signUsingWindowsSDKTool = (exeToSign, keyFilePath, password, callback) ->
+    grunt.log.ok("Signing #{exeToSign}")
+    args = ['sign', '/v', '/p', password, '/f', keyFilePath, exeToSign]
+    spawn {cmd: 'C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.1A\\bin\\signtool.exe', args: args}, callback
+
+  signUsingJanky = (exeToSign, callback) ->
+    spawn {cmd: process.env.JANKY_SIGNTOOL, args: [exeToSign]}, callback
+
+  signWindowsExecutable = if process.env.JANKY_SIGNTOOL then signUsingJanky else signUsingWindowsSDK
+
  grunt.registerTask 'codesign:exe', 'CodeSign Atom.exe and Update.exe', ->
    done = @async()
    spawn {cmd: 'taskkill', args: ['/F', '/IM', 'atom.exe']}, ->
-      cmd = process.env.JANKY_SIGNTOOL ? 'signtool'
      atomExePath = path.join(grunt.config.get('atom.shellAppDir'), 'atom.exe')
-      spawn {cmd, args: [atomExePath]}, (error) ->
+      signWindowsExecutable atomExePath, (error) ->
        return done(error) if error?

        updateExePath = path.resolve(__dirname, '..', 'node_modules', 'grunt-electron-installer', 'vendor', 'Update.exe')
-        spawn {cmd, args: [updateExePath]}, (error) -> done(error)
+        signWindowsExecutable updateExePath, (error) -> done(error)

  grunt.registerTask 'codesign:installer', 'CodeSign AtomSetup.exe', ->
    done = @async()
-    cmd = process.env.JANKY_SIGNTOOL ? 'signtool'
    atomSetupExePath = path.resolve(grunt.config.get('atom.buildDir'), 'installer', 'AtomSetup.exe')
-    spawn {cmd, args: [atomSetupExePath]}, (error) -> done(error)
+    signWindowsExecutable atomSetupExePath, (error) -> done(error)

  grunt.registerTask 'codesign:app', 'CodeSign Atom.app', ->
    done = @async()
@@ -26,14 +48,24 @@ module.exports = (grunt) ->
    unlockKeychain (error) ->
      return done(error) if error?

-      cmd = 'codesign'
      args = ['--deep', '--force', '--verbose', '--sign', 'Developer ID Application: GitHub', grunt.config.get('atom.shellAppDir')]
-      spawn {cmd, args}, (error) -> done(error)
+      spawn {cmd: 'codesign', args: args}, (error) -> done(error)

  unlockKeychain = (callback) ->
    return callback() unless process.env.XCODE_KEYCHAIN

-    cmd = 'security'
    {XCODE_KEYCHAIN_PASSWORD, XCODE_KEYCHAIN} = process.env
    args = ['unlock-keychain', '-p', XCODE_KEYCHAIN_PASSWORD, XCODE_KEYCHAIN]
-    spawn {cmd, args}, (error) -> callback(error)
+    spawn {cmd: 'security', args: args}, (error) -> callback(error)
+
+  downloadFile = (sourceUrl, targetPath, callback) ->
+    options = {
+      url: sourceUrl
+      headers: {
+        'User-Agent': 'Atom Signing Key build task',
+        'Accept': 'application/vnd.github.VERSION.raw'
+      }
+    }
+    request(options)
+      .pipe(fs.createWriteStream(targetPath))
+      .on('finish', callback)
--- a/build/tasks/license-overrides.coffee
+++ b/build/tasks/license-overrides.coffee
@@ -123,10 +123,10 @@ module.exports =
    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    """
-  'tweetnacl@0.13.2':
+  'tweetnacl@0.14.3':
    repository: 'https://github.com/dchest/tweetnacl-js'
    license: 'Public Domain'
-    source: 'https://github.com/dchest/tweetnacl-js/blob/2f328394f74d83564634fb89ea2798caa3a4edb9/README.md says public domain.'
+    source: 'https://github.com/dchest/tweetnacl-js/blob/1042c9c65dc8f1dcb9e981d962d7dbbcf58f1fdc/COPYING.txt says public domain.'
  'json-schema@0.2.2':
    repository: 'https://github.com/kriszyp/json-schema'
    license: 'BSD'
--- a/build/tasks/mktar-task.coffee
+++ b/build/tasks/mktar-task.coffee
@@ -0,0 +1,30 @@
+path = require 'path'
+
+module.exports = (grunt) ->
+  {spawn, fillTemplate} = require('./task-helpers')(grunt)
+
+  grunt.registerTask 'mktar', 'Create an archive', ->
+    done = @async()
+
+    appFileName = grunt.config.get('atom.appFileName')
+    buildDir = grunt.config.get('atom.buildDir')
+    shellAppDir = grunt.config.get('atom.shellAppDir')
+    {version, description} = grunt.config.get('atom.metadata')
+
+    if process.arch is 'ia32'
+      arch = 'i386'
+    else if process.arch is 'x64'
+      arch = 'amd64'
+    else
+      return done("Unsupported arch #{process.arch}")
+
+    iconPath = path.join(shellAppDir, 'resources', 'app.asar.unpacked', 'resources', 'atom.png')
+
+    cmd = path.join('script', 'mktar')
+    args = [appFileName, version, arch, iconPath, buildDir]
+    spawn {cmd, args}, (error) ->
+      if error?
+        done(error)
+      else
+        grunt.log.ok "Created " + path.join(buildDir, "#{appFileName}-#{version}-#{arch}.tar.gz")
+        done()
--- a/build/tasks/publish-build-task.coffee
+++ b/build/tasks/publish-build-task.coffee
@@ -85,13 +85,13 @@ getAssets = ->
        arch = 'amd64'

      # Check for a Debian build
-      sourcePath = "#{buildDir}/#{appFileName}-#{version}-#{arch}.deb"
+      sourcePath = path.join(buildDir, "#{appFileName}-#{version}-#{arch}.deb")
      assetName = "atom-#{arch}.deb"

      # Check for a Fedora build
      unless fs.isFileSync(sourcePath)
        rpmName = fs.readdirSync("#{buildDir}/rpm")[0]
-        sourcePath = "#{buildDir}/rpm/#{rpmName}"
+        sourcePath = path.join(buildDir, "rpm", rpmName)
        if process.arch is 'ia32'
          arch = 'i386'
        else
@@ -99,10 +99,17 @@ getAssets = ->
        assetName = "atom.#{arch}.rpm"

      cp sourcePath, path.join(buildDir, assetName)
+      assets = [{assetName, sourcePath}]

-      [
-        {assetName, sourcePath}
-      ]
+      # Check for an archive build on a debian build machine.
+      # We could provide a Fedora version if some libraries are not compatible
+      sourcePath = path.join(buildDir, "#{appFileName}-#{version}-#{arch}.tar.gz")
+      if fs.isFileSync(sourcePath)
+        assetName = "atom-#{arch}.tar.gz"
+        cp sourcePath, path.join(buildDir, assetName)
+        assets.push({assetName, sourcePath})
+
+      assets

 logError = (message, error, details) ->
  grunt.log.error(message)
--- a/changes.md
+++ b/changes.md
--- a/changes2.md
+++ b/changes2.md
@@ -0,0 +1,397 @@
+### [Atom Core](https://github.com/atom/atom)
+
+v1.6.0...v1.7.0-beta0
+
+* [atom/atom#10747 - Clarify Windows build docs for VS2015 etc.](https://github.com/atom/atom/pull/10747)
+* [atom/atom#10743 - Don't cascade on reload](https://github.com/atom/atom/pull/10743)
+* [atom/atom#9198 - permit any whole number for tabLength](https://github.com/atom/atom/pull/9198)
+* [atom/atom#10758 - Fix status in subdir](https://github.com/atom/atom/pull/10758)
+* [atom/atom#10768 - Temporarily disable deserializers & viewProviders metadata fields](https://github.com/atom/atom/pull/10768)
+* [atom/atom#10764 - Let packages define deserializers & view providers as main module methods](https://github.com/atom/atom/pull/10764)
+* [atom/atom#10778 - Fix minor typo in CONTRIBUTING.md](https://github.com/atom/atom/pull/10778)
+* [atom/atom#10789 - Upgrade autocomplete-plus to use new text-buffer API](https://github.com/atom/atom/pull/10789)
+* [atom/atom#10797 - Fix status with multiple paths](https://github.com/atom/atom/pull/10797)
+* [atom/atom#10797 - Fix status with multiple paths](https://github.com/atom/atom/pull/10797)
+* [atom/atom#10792 - Fix TextEditorPresenter spec timeout.](https://github.com/atom/atom/pull/10792)
+* [atom/atom#10803 - Fix typo in function call](https://github.com/atom/atom/pull/10803)
+* [atom/atom#10828 - Fix another TextEditorPresenter spec race](https://github.com/atom/atom/pull/10828)
+* [atom/atom#10827 - Port repository subdirectory status fixes to async repo](https://github.com/atom/atom/pull/10827)
+* [atom/atom#10827 - Port repository subdirectory status fixes to async repo](https://github.com/atom/atom/pull/10827)
+* [atom/atom#10838 - Log output for core specs](https://github.com/atom/atom/pull/10838)
+* [atom/atom#10818 - Register Atom for file associations in Windows](https://github.com/atom/atom/pull/10818)
+* [atom/atom#10605 - Periodically save state and store in indexedDB](https://github.com/atom/atom/pull/10605)
+* [atom/atom#9627 - Update to Electron 0.36](https://github.com/atom/atom/pull/9627)
+* [atom/atom#10835 - Add TextEditor.prototype.cursorsForScreenRowRange](https://github.com/atom/atom/pull/10835)
+* [atom/atom#10795 - Remove unused Core Team Project Management labels](https://github.com/atom/atom/pull/10795)
+* [atom/atom#10858 - Update grunt-electron-installer to latest version](https://github.com/atom/atom/pull/10858)
+* [atom/atom#10846 - Add core setting for pending tabs configuration](https://github.com/atom/atom/pull/10846)
+* [atom/atom#10846 - Add core setting for pending tabs configuration](https://github.com/atom/atom/pull/10846)
+* [atom/atom#10873 - Avoid emitting config events while loading packages](https://github.com/atom/atom/pull/10873)
+* [atom/atom#10872 - Terminate pending state for opened file if pending option is false](https://github.com/atom/atom/pull/10872)
+* [atom/atom#10872 - Terminate pending state for opened file if pending option is false](https://github.com/atom/atom/pull/10872)
+* [atom/atom#10863 - Compare markers instead of ranges in Selection](https://github.com/atom/atom/pull/10863)
+* [atom/atom#10874 - Avoid Windows 260-character path limits in script\clean](https://github.com/atom/atom/pull/10874)
+* [atom/atom#10861 - Compute line foldability lazily](https://github.com/atom/atom/pull/10861)
+* [atom/atom#10843 - Bump packages to use async git](https://github.com/atom/atom/pull/10843)
+* [atom/atom#10886 - Update Atom build directory in build instructions](https://github.com/atom/atom/pull/10886)
+* [atom/atom#10885 - Cache regexes in LanguageMode.prototype.getRegexForProperty](https://github.com/atom/atom/pull/10885)
+* [atom/atom#10888 - Load packages before deserializing state](https://github.com/atom/atom/pull/10888)
+* [atom/atom#10870 - Add Issue template and extra version info](https://github.com/atom/atom/pull/10870)
+* [atom/atom#10878 - Allow pasting white space when `autoIndentOnPaste` is enabled](https://github.com/atom/atom/pull/10878)
+* [atom/atom#10895 - Fix some spec issues](https://github.com/atom/atom/pull/10895)
+* [atom/atom#10901 - remove Open Roadmap menu item, fixes #10884](https://github.com/atom/atom/pull/10901)
+* [atom/atom#10898 - Pass the notification manager when splitting panes](https://github.com/atom/atom/pull/10898)
+* [atom/atom#10927 - Upgrade electron to fix command-backtick bug](https://github.com/atom/atom/pull/10927)
+* [atom/atom#10926 - Fix case-preserving path relativization](https://github.com/atom/atom/pull/10926)
+* [atom/atom#10926 - Fix case-preserving path relativization](https://github.com/atom/atom/pull/10926)
+* [atom/atom#10921 - Add support for keybindings with keyup keystrokes](https://github.com/atom/atom/pull/10921)
+* [atom/atom#10841 - Add the -a, --add CLI option](https://github.com/atom/atom/pull/10841)
+* [atom/atom#10933 - Fix block decorations spec in text editor presenter](https://github.com/atom/atom/pull/10933)
+* [atom/atom#10925 - Faster state serialization](https://github.com/atom/atom/pull/10925)
+* [atom/atom#10967 - Fix a inconsistent getLineCount() use](https://github.com/atom/atom/pull/10967)
+* [atom/atom#10967 - Fix a inconsistent getLineCount() use](https://github.com/atom/atom/pull/10967)
+* [atom/atom#10975 - Update nodegit](https://github.com/atom/atom/pull/10975)
+* [atom/atom#10975 - Update nodegit](https://github.com/atom/atom/pull/10975)
+* [atom/atom#10326 - Fix Windows installer path update woes](https://github.com/atom/atom/pull/10326)
+* [atom/atom#10959 - Refactor pending state to live in pane instead of items](https://github.com/atom/atom/pull/10959)
+* [atom/atom#10959 - Refactor pending state to live in pane instead of items](https://github.com/atom/atom/pull/10959)
+* [atom/atom#10984 - [WIP] experiment with circle ci](https://github.com/atom/atom/pull/10984)
+* [atom/atom#10737 - Add MRU tab switching functionality](https://github.com/atom/atom/pull/10737)
+* [atom/atom#11001 - onDidTerminatePendingState ➡︎ onItemDidTerminatePendingState](https://github.com/atom/atom/pull/11001)
+* [atom/atom#11001 - onDidTerminatePendingState ➡︎ onItemDidTerminatePendingState](https://github.com/atom/atom/pull/11001)
+* [atom/atom#10972 - Update build scripts to use the new railcar branching model](https://github.com/atom/atom/pull/10972)
+* [atom/atom#10972 - Update build scripts to use the new railcar branching model](https://github.com/atom/atom/pull/10972)
+* [atom/atom#11006 - Move spec from tabs package](https://github.com/atom/atom/pull/11006)
+* [atom/atom#10851 - Registry for TextEditors](https://github.com/atom/atom/pull/10851)
+* [atom/atom#11010 - Always strip git+ prefix and .git suffix from package repository URLs](https://github.com/atom/atom/pull/11010)
+* [atom/atom#11011 - Autoscroll after consolidating selections](https://github.com/atom/atom/pull/11011)
+* [atom/atom#11008 - Add documentation for order key in config.](https://github.com/atom/atom/pull/11008)
+* [atom/atom#11009 - Don't destroy pane if replacing last pending item](https://github.com/atom/atom/pull/11009)
+* [atom/atom#11009 - Don't destroy pane if replacing last pending item](https://github.com/atom/atom/pull/11009)
+* [atom/atom#10675 - Expose application updater lifecycle events to packages](https://github.com/atom/atom/pull/10675)
+* [atom/atom#11022 - Windows git fixes](https://github.com/atom/atom/pull/11022)
+* [atom/atom#11022 - Windows git fixes](https://github.com/atom/atom/pull/11022)
+* [atom/atom#11051 - Add new item before destroying pending item](https://github.com/atom/atom/pull/11051)
+* [atom/atom#11051 - Add new item before destroying pending item](https://github.com/atom/atom/pull/11051)
+* [atom/atom#11036 - Skip deleted directories when restoring application windows](https://github.com/atom/atom/pull/11036)
+* [atom/atom#11063 - Show tooltip immediately if the tooltip trigger is manual](https://github.com/atom/atom/pull/11063)
+* [atom/atom#10511 - Use ELECTRON_RUN_AS_NODE Variable Key](https://github.com/atom/atom/pull/10511)
+* [atom/atom#10955 - TextEditor customization](https://github.com/atom/atom/pull/10955)
+* [atom/atom#11065 - Default to auto height being true.](https://github.com/atom/atom/pull/11065)
+* [atom/atom#11053 - Ensure atom.cmd --wait correctly waits in Windows cmd & powershell](https://github.com/atom/atom/pull/11053)
+* [atom/atom#11060 - Serialize MarkerLayers only on quit](https://github.com/atom/atom/pull/11060)
+* [atom/atom#11057 - Move Pane::addItem 'pending' option to options object](https://github.com/atom/atom/pull/11057)
+* [atom/atom#11057 - Move Pane::addItem 'pending' option to options object](https://github.com/atom/atom/pull/11057)
+* [atom/atom#11089 - Update nodegit](https://github.com/atom/atom/pull/11089)
+* [atom/atom#11089 - Update nodegit](https://github.com/atom/atom/pull/11089)
+* [atom/atom#11099 - Add zero to hexadecimal numbers below F (16)](https://github.com/atom/atom/pull/11099)
+* [atom/atom#11101 - Emit status changes when anything changes](https://github.com/atom/atom/pull/11101)
+* [atom/atom#11101 - Emit status changes when anything changes](https://github.com/atom/atom/pull/11101)
+* [atom/atom#11077 - Scroll to cursor on unfold all](https://github.com/atom/atom/pull/11077)
+* [atom/atom#11103 - Make cli atom --wait work on Cygwin](https://github.com/atom/atom/pull/11103)
+* [atom/atom#11115 - Update nodegit](https://github.com/atom/atom/pull/11115)
+* [atom/atom#11115 - Update nodegit](https://github.com/atom/atom/pull/11115)
+* [atom/atom#11111 - Default the options parameter to an empty object](https://github.com/atom/atom/pull/11111)
+* [atom/atom#11127 - Bump markdown-preview@v0.158.0](https://github.com/atom/atom/pull/11127)
+* [atom/atom#8793 - squirrel-update test on desktop shortcut groups too many assertions](https://github.com/atom/atom/pull/8793)
+* [atom/atom#11078 - Add TextEditors to the registry only when opting in](https://github.com/atom/atom/pull/11078)
+* [atom/atom#11054 - Patch Environment On OSX And Allow A Different Environment Per Window](https://github.com/atom/atom/pull/11054)
+* [atom/atom#11153 - Fix node env](https://github.com/atom/atom/pull/11153)
+* [atom/atom#11162 - BufferedProcess: search only new data for new lines rather than entire buffer, take 2](https://github.com/atom/atom/pull/11162)
+* [atom/atom#11166 - Note where GitRepositoryAsync deviates from its synchronous predecessor](https://github.com/atom/atom/pull/11166)
+
+### [one-dark-ui](https://github.com/atom/one-dark-ui)
+
+v1.1.9...v1.2.0
+
+* [atom/one-dark-ui#113 - Specify config schema in package.json](https://github.com/atom/one-dark-ui/pull/113)
+* [atom/one-dark-ui#121 - Fix typo in comment for ui-variables.less](https://github.com/atom/one-dark-ui/pull/121)
+
+### [one-light-ui](https://github.com/atom/one-light-ui)
+
+v1.1.9...v1.2.0
+
+* [atom/one-light-ui#48 - Specify config schema in package.json](https://github.com/atom/one-light-ui/pull/48)
+
+### [about](https://github.com/atom/about)
+
+v1.3.0...v1.4.1
+
+* [atom/about#6 - Specify deserializer in package.json](https://github.com/atom/about/pull/6)
+* [atom/about#6 - Specify deserializer in package.json](https://github.com/atom/about/pull/6)
+* [atom/about#13 - Specify deserializer method in package.json, the new way](https://github.com/atom/about/pull/13)
+* [atom/about#12 - Show update information on the about page](https://github.com/atom/about/pull/12)
+* [atom/about#15 - Move away from deprecated Electron require syntax](https://github.com/atom/about/pull/15)
+
+### [archive-view](https://github.com/atom/archive-view)
+
+v0.61.0...v0.61.1
+
+* [atom/archive-view#32 - Specify deserializer in package.json](https://github.com/atom/archive-view/pull/32)
+
+### [autocomplete-plus](https://github.com/atom/autocomplete-plus)
+
+v2.25.0...v2.29.1
+
+* [atom/autocomplete-plus#612 - bugfix: auto indentation after suggestion confirm](https://github.com/atom/autocomplete-plus/pull/612)
+* [atom/autocomplete-plus#641 - Stop flickering when adjusting margins](https://github.com/atom/autocomplete-plus/pull/641)
+* [atom/autocomplete-plus#637 - Move config schema to package.json](https://github.com/atom/autocomplete-plus/pull/637)
+* [atom/autocomplete-plus#659 - Batch autocompletion show/hide](https://github.com/atom/autocomplete-plus/pull/659)
+* [atom/autocomplete-plus#675 - :art: Clean up formatting of fileBlacklist setting description](https://github.com/atom/autocomplete-plus/pull/675)
+* [atom/autocomplete-plus#672 - Redesign SymbolStore and SymbolProvider](https://github.com/atom/autocomplete-plus/pull/672)
+* [atom/autocomplete-plus#667 - Add unicode support for \w regexps](https://github.com/atom/autocomplete-plus/pull/667)
+* [atom/autocomplete-plus#681 - Fix maximum call stack size exceeded error](https://github.com/atom/autocomplete-plus/pull/681)
+
+### [autosave](https://github.com/atom/autosave)
+
+v0.23.0...v0.23.1
+
+* [atom/autosave#56 - Move config schema to package.json](https://github.com/atom/autosave/pull/56)
+
+### [bracket-matcher](https://github.com/atom/bracket-matcher)
+
+v0.79.0...v0.81.0
+
+* [atom/bracket-matcher#196 - Fix spelling in settings](https://github.com/atom/bracket-matcher/pull/196)
+* [atom/bracket-matcher#197 - Move config schema to package.json](https://github.com/atom/bracket-matcher/pull/197)
+* [atom/bracket-matcher#212 - Make updating matches faster for multi-cursor editing](https://github.com/atom/bracket-matcher/pull/212)
+* [atom/bracket-matcher#219 - Clean up view subscriptions when editor is destroyed](https://github.com/atom/bracket-matcher/pull/219)
+* [atom/bracket-matcher#221 - Enable bracket matching for elixir](https://github.com/atom/bracket-matcher/pull/221)
+
+### [deprecation-cop](https://github.com/atom/deprecation-cop)
+
+v0.54.0...v0.54.1
+
+* [atom/deprecation-cop#65 - Move deserializer into package.json](https://github.com/atom/deprecation-cop/pull/65)
+* [atom/deprecation-cop#65 - Move deserializer into package.json](https://github.com/atom/deprecation-cop/pull/65)
+* [atom/deprecation-cop#67 - Specify deserializer method in package.json](https://github.com/atom/deprecation-cop/pull/67)
+
+### [fuzzy-finder](https://github.com/atom/fuzzy-finder)
+
+v0.94.0...v1.0.3
+
+* [atom/fuzzy-finder#160 - Move config schema to package.json](https://github.com/atom/fuzzy-finder/pull/160)
+* [atom/fuzzy-finder#167 - Async git](https://github.com/atom/fuzzy-finder/pull/167)
+* [atom/fuzzy-finder#174 - Fix spec race](https://github.com/atom/fuzzy-finder/pull/174)
+* [atom/fuzzy-finder#178 - Handle symlink project paths](https://github.com/atom/fuzzy-finder/pull/178)
+* [atom/fuzzy-finder#180 - Return project paths correctly if last-opened path is not in project](https://github.com/atom/fuzzy-finder/pull/180)
+
+### [git-diff](https://github.com/atom/git-diff)
+
+v0.57.0...v1.0.1
+
+* [atom/git-diff#81 - Move config schema to package.json](https://github.com/atom/git-diff/pull/81)
+* [atom/git-diff#82 - Async git](https://github.com/atom/git-diff/pull/82)
+* [atom/git-diff#95 - Catch errors from new files.](https://github.com/atom/git-diff/pull/95)
+
+### [grammar-selector](https://github.com/atom/grammar-selector)
+
+v0.48.0...v0.48.1
+
+* [atom/grammar-selector#25 - Add description for config setting](https://github.com/atom/grammar-selector/pull/25)
+* [atom/grammar-selector#29 - Move config schema to package.json](https://github.com/atom/grammar-selector/pull/29)
+
+### [image-view](https://github.com/atom/image-view)
+
+v0.56.0...v0.57.0
+
+* [atom/image-view#40 - Zoom to fit](https://github.com/atom/image-view/pull/40)
+
+### [incompatible-packages](https://github.com/atom/incompatible-packages)
+
+v0.25.0...v0.25.1
+
+* [atom/incompatible-packages#11 - Move deserializer to package.json](https://github.com/atom/incompatible-packages/pull/11)
+* [atom/incompatible-packages#11 - Move deserializer to package.json](https://github.com/atom/incompatible-packages/pull/11)
+* [atom/incompatible-packages#12 - Specify deserializer method in package.json](https://github.com/atom/incompatible-packages/pull/12)
+
+### [keybinding-resolver](https://github.com/atom/keybinding-resolver)
+
+v0.33.0...v0.35.0
+
+* [atom/keybinding-resolver#23 - Update coffeelint support](https://github.com/atom/keybinding-resolver/pull/23)
+* [atom/keybinding-resolver#37 - Show keyup events that match a binding](https://github.com/atom/keybinding-resolver/pull/37)
+
+### [line-ending-selector](https://github.com/atom/line-ending-selector)
+
+v0.3.0...v0.3.1
+
+* [atom/line-ending-selector#17 - Move config schema to package.json](https://github.com/atom/line-ending-selector/pull/17)
+
+### [link](https://github.com/atom/link)
+
+v0.31.0...v0.31.1
+
+* [atom/link#14 - Move away from deprecated Electron require syntax](https://github.com/atom/link/pull/14)
+
+### [markdown-preview](https://github.com/atom/markdown-preview)
+
+v0.157.2...v0.158.0
+
+* [atom/markdown-preview#349 - Use new package.json fields (configSchema and deserializers)](https://github.com/atom/markdown-preview/pull/349)
+* [atom/markdown-preview#349 - Use new package.json fields (configSchema and deserializers)](https://github.com/atom/markdown-preview/pull/349)
+* [atom/markdown-preview#367 - Use new package.json fields to allow deferred loading](https://github.com/atom/markdown-preview/pull/367)
+* [atom/markdown-preview#335 - Use GitHub style when "Save as HTML"](https://github.com/atom/markdown-preview/pull/335)
+
+### [notifications](https://github.com/atom/notifications)
+
+v0.62.1...v0.63.1
+
+* [atom/notifications#105 - Move config schema to package.json](https://github.com/atom/notifications/pull/105)
+* [atom/notifications#111 - Use https://git.io insead of http](https://github.com/atom/notifications/pull/111)
+* [atom/notifications#113 - replace ATOM_HOME in issue title with generic placeholder](https://github.com/atom/notifications/pull/113)
+* [atom/notifications#114 - Use bit.ly instead of git.io.](https://github.com/atom/notifications/pull/114)
+* [atom/notifications#115 - URL shortening, take 2](https://github.com/atom/notifications/pull/115)
+
+### [open-on-github](https://github.com/atom/open-on-github)
+
+v0.41.0...v1.0.1
+
+* [atom/open-on-github#59 - Move config schema to package.json](https://github.com/atom/open-on-github/pull/59)
+* [atom/open-on-github#60 - Async git](https://github.com/atom/open-on-github/pull/60)
+* [atom/open-on-github#66 - Move away from deprecated Electron require syntax](https://github.com/atom/open-on-github/pull/66)
+
+### [package-generator](https://github.com/atom/package-generator)
+
+v0.41.0...v1.0.0
+
+* [atom/package-generator#37 - Move config schema to package.json](https://github.com/atom/package-generator/pull/37)
+* [atom/package-generator#36 - Support JS package generation](https://github.com/atom/package-generator/pull/36)
+
+### [settings-view](https://github.com/atom/settings-view)
+
+v0.232.3...v0.235.0
+
+* [atom/settings-view#731 - Specify deserializer in package.json](https://github.com/atom/settings-view/pull/731)
+* [atom/settings-view#749 - Move away from deprecated Electron require syntax](https://github.com/atom/settings-view/pull/749)
+* [atom/settings-view#750 - Another require fix for remote](https://github.com/atom/settings-view/pull/750)
+* [atom/settings-view#743 - Display and manage Git-based packages](https://github.com/atom/settings-view/pull/743)
+* [atom/settings-view#748 - Add defaults on focus](https://github.com/atom/settings-view/pull/748)
+* [atom/settings-view#736 - Add collapsable section for option groups](https://github.com/atom/settings-view/pull/736)
+
+### [spell-check](https://github.com/atom/spell-check)
+
+v0.65.0...v0.67.0
+
+* [atom/spell-check#103 - Update README.md](https://github.com/atom/spell-check/pull/103)
+* [atom/spell-check#33 - Add feature: toggle on/off](https://github.com/atom/spell-check/pull/33)
+* [atom/spell-check#108 - subscriptionsOfCommands -> commandSubscription](https://github.com/atom/spell-check/pull/108)
+* [atom/spell-check#112 - Move config schema to package.json](https://github.com/atom/spell-check/pull/112)
+* [atom/spell-check#114 - updates spellchecker to use system language](https://github.com/atom/spell-check/pull/114)
+
+### [status-bar](https://github.com/atom/status-bar)
+
+v0.83.0...v1.2.0
+
+* [atom/status-bar#121 - Move config schema to package.json](https://github.com/atom/status-bar/pull/121)
+* [atom/status-bar#114 - Async git](https://github.com/atom/status-bar/pull/114)
+* [atom/status-bar#122 - Make updating info faster for multi-cursor edits](https://github.com/atom/status-bar/pull/122)
+* [atom/status-bar#129 - Hide diff stats for new files](https://github.com/atom/status-bar/pull/129)
+* [atom/status-bar#131 - Fix error with no active item](https://github.com/atom/status-bar/pull/131)
+* [atom/status-bar#133 - Move to the footer](https://github.com/atom/status-bar/pull/133)
+
+### [styleguide](https://github.com/atom/styleguide)
+
+v0.45.1...v0.45.2
+
+* [atom/styleguide#34 - Specify deserializer in package.json](https://github.com/atom/styleguide/pull/34)
+
+### [symbols-view](https://github.com/atom/symbols-view)
+
+v0.110.1...v0.112.0
+
+* [atom/symbols-view#147 - Add support for ES2015 static methods](https://github.com/atom/symbols-view/pull/147)
+* [atom/symbols-view#151 - Specify config schema in package.json](https://github.com/atom/symbols-view/pull/151)
+* [atom/symbols-view#157 - Add es7 async functions to ctags](https://github.com/atom/symbols-view/pull/157)
+
+### [tabs](https://github.com/atom/tabs)
+
+v0.91.3...v0.92.0
+
+* [atom/tabs#134 - Add "open in new window" option to tabs context menu](https://github.com/atom/tabs/pull/134)
+
+### [timecop](https://github.com/atom/timecop)
+
+v0.33.0...v0.33.1
+
+* [atom/timecop#15 - Specify deserializer in package.json](https://github.com/atom/timecop/pull/15)
+
+### [welcome](https://github.com/atom/welcome)
+
+v0.33.0...v0.34.0
+
+* [atom/welcome#45 - Move config schema to package.json](https://github.com/atom/welcome/pull/45)
+* [atom/welcome#47 - Change menu names for different platforms](https://github.com/atom/welcome/pull/47)
+
+### [whitespace](https://github.com/atom/whitespace)
+
+v0.32.1...v0.32.2
+
+* [atom/whitespace#107 - Move config schema to package.json](https://github.com/atom/whitespace/pull/107)
+
+### [language-clojure](https://github.com/atom/language-clojure)
+
+v0.19.1...v0.20.0
+
+* [atom/language-clojure#39 - Fix tokenization of sexp and map nested at beginning of another sexp](https://github.com/atom/language-clojure/pull/39)
+
+### [language-coffee-script](https://github.com/atom/language-coffee-script)
+
+v0.46.0...v0.46.1
+
+* [atom/language-coffee-script#85 - Check for word boundaries when attempting to auto-indent](https://github.com/atom/language-coffee-script/pull/85)
+
+### [language-csharp](https://github.com/atom/language-csharp)
+
+v0.11.0...v0.12.0
+
+* [atom/language-csharp#53 - Make nameof a keyword](https://github.com/atom/language-csharp/pull/53)
+* [atom/language-csharp#54 - Make C# 6's when a keyword](https://github.com/atom/language-csharp/pull/54)
+
+### [language-gfm](https://github.com/atom/language-gfm)
+
+v0.84.0...v0.85.0
+
+* [atom/language-gfm#140 - Highlight HTML entities inside bold, italic, and strikethrough text](https://github.com/atom/language-gfm/pull/140)
+
+### [language-html](https://github.com/atom/language-html)
+
+v0.44.0...v0.44.1
+
+* [atom/language-html#108 - Fixes #102 - ng-template highlighting for script tags](https://github.com/atom/language-html/pull/108)
+
+### [language-json](https://github.com/atom/language-json)
+
+v0.17.4...v0.17.6
+
+* [atom/language-json#42 - Add .jsonld file support](https://github.com/atom/language-json/pull/42)
+* [atom/language-json#43 - add composer.lock files](https://github.com/atom/language-json/pull/43)
+* [atom/language-json#44 - Add .tern-project and .tern-config to file types](https://github.com/atom/language-json/pull/44)
+
+### [language-ruby](https://github.com/atom/language-ruby)
+
+v0.68.0...v0.68.3
+
+* [atom/language-ruby#135 - Adds cr (Crystal lang) to fileTypes for Ruby grammar](https://github.com/atom/language-ruby/pull/135)
+* [atom/language-ruby#137 - Changes dop and do order priority](https://github.com/atom/language-ruby/pull/137)
+* [atom/language-ruby#136 - Fixes for tokenization of Kernel methods ending in ? or !](https://github.com/atom/language-ruby/pull/136)
+* [atom/language-ruby#140 - Revert do/dop order change](https://github.com/atom/language-ruby/pull/140)
+
+### [language-sass](https://github.com/atom/language-sass)
+
+v0.45.0...v0.46.0
+
+* [atom/language-sass#101 - Add individual border-radius properties](https://github.com/atom/language-sass/pull/101)
+
+### [language-text](https://github.com/atom/language-text)
+
+v0.7.0...v0.7.1
+
+* [atom/language-text#5 - Add travis.yml](https://github.com/atom/language-text/pull/5)
+* [atom/language-text#6 - Update legal date to 2016](https://github.com/atom/language-text/pull/6)
+
+### [language-xml](https://github.com/atom/language-xml)
+
+v0.34.2...v0.34.4
+
+* [atom/language-xml#43 - Fix incorrect highlighting for empty element](https://github.com/atom/language-xml/pull/43)
--- a/changes3.md
+++ b/changes3.md
@@ -0,0 +1,414 @@
+### Notable Changes
+
+* Crash Recovery
+* Most Recently Used Tab Switching
+* Windows Improvements
+* Environment Patching on OS X
+* Electron Update
+
+### [Atom Core](https://github.com/atom/atom)
+
+v1.6.0-beta8...v1.7.0-beta0
+
+* [atom/atom#10747 - Clarify Windows build docs for VS2015 etc.](https://github.com/atom/atom/pull/10747)
+* [atom/atom#10743 - Don't cascade on reload](https://github.com/atom/atom/pull/10743)
+* [atom/atom#9198 - permit any whole number for tabLength](https://github.com/atom/atom/pull/9198)
+* [atom/atom#10758 - Fix status in subdir](https://github.com/atom/atom/pull/10758)
+* [atom/atom#10768 - Temporarily disable deserializers & viewProviders metadata fields](https://github.com/atom/atom/pull/10768)
+* [atom/atom#10764 - Let packages define deserializers & view providers as main module methods](https://github.com/atom/atom/pull/10764)
+* [atom/atom#10778 - Fix minor typo in CONTRIBUTING.md](https://github.com/atom/atom/pull/10778)
+* [atom/atom#10789 - Upgrade autocomplete-plus to use new text-buffer API](https://github.com/atom/atom/pull/10789)
+* [atom/atom#10797 - Fix status with multiple paths](https://github.com/atom/atom/pull/10797)
+* [atom/atom#10797 - Fix status with multiple paths](https://github.com/atom/atom/pull/10797)
+* [atom/atom#10792 - Fix TextEditorPresenter spec timeout.](https://github.com/atom/atom/pull/10792)
+* [atom/atom#10803 - Fix typo in function call](https://github.com/atom/atom/pull/10803)
+* [atom/atom#10828 - Fix another TextEditorPresenter spec race](https://github.com/atom/atom/pull/10828)
+* [atom/atom#10827 - Port repository subdirectory status fixes to async repo](https://github.com/atom/atom/pull/10827)
+* [atom/atom#10827 - Port repository subdirectory status fixes to async repo](https://github.com/atom/atom/pull/10827)
+* [atom/atom#10838 - Log output for core specs](https://github.com/atom/atom/pull/10838)
+* [atom/atom#10818 - Register Atom for file associations in Windows](https://github.com/atom/atom/pull/10818)
+* [atom/atom#10605 - Periodically save state and store in indexedDB](https://github.com/atom/atom/pull/10605)
+* [atom/atom#9627 - Update to Electron 0.36](https://github.com/atom/atom/pull/9627)
+* [atom/atom#10835 - Add TextEditor.prototype.cursorsForScreenRowRange](https://github.com/atom/atom/pull/10835)
+* [atom/atom#10795 - Remove unused Core Team Project Management labels](https://github.com/atom/atom/pull/10795)
+* [atom/atom#10858 - Update grunt-electron-installer to latest version](https://github.com/atom/atom/pull/10858)
+* [atom/atom#10846 - Add core setting for pending tabs configuration](https://github.com/atom/atom/pull/10846)
+* [atom/atom#10846 - Add core setting for pending tabs configuration](https://github.com/atom/atom/pull/10846)
+* [atom/atom#10873 - Avoid emitting config events while loading packages](https://github.com/atom/atom/pull/10873)
+* [atom/atom#10872 - Terminate pending state for opened file if pending option is false](https://github.com/atom/atom/pull/10872)
+* [atom/atom#10872 - Terminate pending state for opened file if pending option is false](https://github.com/atom/atom/pull/10872)
+* [atom/atom#10863 - Compare markers instead of ranges in Selection](https://github.com/atom/atom/pull/10863)
+* [atom/atom#10874 - Avoid Windows 260-character path limits in script\clean](https://github.com/atom/atom/pull/10874)
+* [atom/atom#10861 - Compute line foldability lazily](https://github.com/atom/atom/pull/10861)
+* [atom/atom#10843 - Bump packages to use async git](https://github.com/atom/atom/pull/10843)
+* [atom/atom#10886 - Update Atom build directory in build instructions](https://github.com/atom/atom/pull/10886)
+* [atom/atom#10885 - Cache regexes in LanguageMode.prototype.getRegexForProperty](https://github.com/atom/atom/pull/10885)
+* [atom/atom#10888 - Load packages before deserializing state](https://github.com/atom/atom/pull/10888)
+* [atom/atom#10870 - Add Issue template and extra version info](https://github.com/atom/atom/pull/10870)
+* [atom/atom#10878 - Allow pasting white space when `autoIndentOnPaste` is enabled](https://github.com/atom/atom/pull/10878)
+* [atom/atom#10895 - Fix some spec issues](https://github.com/atom/atom/pull/10895)
+* [atom/atom#10901 - remove Open Roadmap menu item, fixes #10884](https://github.com/atom/atom/pull/10901)
+* [atom/atom#10898 - Pass the notification manager when splitting panes](https://github.com/atom/atom/pull/10898)
+* [atom/atom#10927 - Upgrade electron to fix command-backtick bug](https://github.com/atom/atom/pull/10927)
+* [atom/atom#10926 - Fix case-preserving path relativization](https://github.com/atom/atom/pull/10926)
+* [atom/atom#10926 - Fix case-preserving path relativization](https://github.com/atom/atom/pull/10926)
+* [atom/atom#10921 - Add support for keybindings with keyup keystrokes](https://github.com/atom/atom/pull/10921)
+* [atom/atom#10841 - Add the -a, --add CLI option](https://github.com/atom/atom/pull/10841)
+* [atom/atom#10933 - Fix block decorations spec in text editor presenter](https://github.com/atom/atom/pull/10933)
+* [atom/atom#10925 - Faster state serialization](https://github.com/atom/atom/pull/10925)
+* [atom/atom#10967 - Fix a inconsistent getLineCount() use](https://github.com/atom/atom/pull/10967)
+* [atom/atom#10967 - Fix a inconsistent getLineCount() use](https://github.com/atom/atom/pull/10967)
+* [atom/atom#10975 - Update nodegit](https://github.com/atom/atom/pull/10975)
+* [atom/atom#10975 - Update nodegit](https://github.com/atom/atom/pull/10975)
+* [atom/atom#10326 - Fix Windows installer path update woes](https://github.com/atom/atom/pull/10326)
+* [atom/atom#10959 - Refactor pending state to live in pane instead of items](https://github.com/atom/atom/pull/10959)
+* [atom/atom#10959 - Refactor pending state to live in pane instead of items](https://github.com/atom/atom/pull/10959)
+* [atom/atom#10984 - [WIP] experiment with circle ci](https://github.com/atom/atom/pull/10984)
+* [atom/atom#10737 - Add MRU tab switching functionality](https://github.com/atom/atom/pull/10737)
+* [atom/atom#11001 - onDidTerminatePendingState ➡︎ onItemDidTerminatePendingState](https://github.com/atom/atom/pull/11001)
+* [atom/atom#11001 - onDidTerminatePendingState ➡︎ onItemDidTerminatePendingState](https://github.com/atom/atom/pull/11001)
+* [atom/atom#10972 - Update build scripts to use the new railcar branching model](https://github.com/atom/atom/pull/10972)
+* [atom/atom#10972 - Update build scripts to use the new railcar branching model](https://github.com/atom/atom/pull/10972)
+* [atom/atom#11006 - Move spec from tabs package](https://github.com/atom/atom/pull/11006)
+* [atom/atom#10851 - Registry for TextEditors](https://github.com/atom/atom/pull/10851)
+* [atom/atom#11010 - Always strip git+ prefix and .git suffix from package repository URLs](https://github.com/atom/atom/pull/11010)
+* [atom/atom#11011 - Autoscroll after consolidating selections](https://github.com/atom/atom/pull/11011)
+* [atom/atom#11008 - Add documentation for order key in config.](https://github.com/atom/atom/pull/11008)
+* [atom/atom#11009 - Don't destroy pane if replacing last pending item](https://github.com/atom/atom/pull/11009)
+* [atom/atom#11009 - Don't destroy pane if replacing last pending item](https://github.com/atom/atom/pull/11009)
+* [atom/atom#10675 - Expose application updater lifecycle events to packages](https://github.com/atom/atom/pull/10675)
+* [atom/atom#11022 - Windows git fixes](https://github.com/atom/atom/pull/11022)
+* [atom/atom#11022 - Windows git fixes](https://github.com/atom/atom/pull/11022)
+* [atom/atom#11051 - Add new item before destroying pending item](https://github.com/atom/atom/pull/11051)
+* [atom/atom#11051 - Add new item before destroying pending item](https://github.com/atom/atom/pull/11051)
+* [atom/atom#11036 - Skip deleted directories when restoring application windows](https://github.com/atom/atom/pull/11036)
+* [atom/atom#11063 - Show tooltip immediately if the tooltip trigger is manual](https://github.com/atom/atom/pull/11063)
+* [atom/atom#10511 - Use ELECTRON_RUN_AS_NODE Variable Key](https://github.com/atom/atom/pull/10511)
+* [atom/atom#10955 - TextEditor customization](https://github.com/atom/atom/pull/10955)
+* [atom/atom#11065 - Default to auto height being true.](https://github.com/atom/atom/pull/11065)
+* [atom/atom#11053 - Ensure atom.cmd --wait correctly waits in Windows cmd & powershell](https://github.com/atom/atom/pull/11053)
+* [atom/atom#11060 - Serialize MarkerLayers only on quit](https://github.com/atom/atom/pull/11060)
+* [atom/atom#11057 - Move Pane::addItem 'pending' option to options object](https://github.com/atom/atom/pull/11057)
+* [atom/atom#11057 - Move Pane::addItem 'pending' option to options object](https://github.com/atom/atom/pull/11057)
+* [atom/atom#11089 - Update nodegit](https://github.com/atom/atom/pull/11089)
+* [atom/atom#11089 - Update nodegit](https://github.com/atom/atom/pull/11089)
+* [atom/atom#11099 - Add zero to hexadecimal numbers below F (16)](https://github.com/atom/atom/pull/11099)
+* [atom/atom#11101 - Emit status changes when anything changes](https://github.com/atom/atom/pull/11101)
+* [atom/atom#11101 - Emit status changes when anything changes](https://github.com/atom/atom/pull/11101)
+* [atom/atom#11077 - Scroll to cursor on unfold all](https://github.com/atom/atom/pull/11077)
+* [atom/atom#11103 - Make cli atom --wait work on Cygwin](https://github.com/atom/atom/pull/11103)
+* [atom/atom#11115 - Update nodegit](https://github.com/atom/atom/pull/11115)
+* [atom/atom#11111 - Default the options parameter to an empty object](https://github.com/atom/atom/pull/11111)
+* [atom/atom#11127 - Bump markdown-preview@v0.158.0](https://github.com/atom/atom/pull/11127)
+* [atom/atom#8793 - squirrel-update test on desktop shortcut groups too many assertions](https://github.com/atom/atom/pull/8793)
+* [atom/atom#11078 - Add TextEditors to the registry only when opting in](https://github.com/atom/atom/pull/11078)
+* [atom/atom#11054 - Patch Environment On OSX And Allow A Different Environment Per Window](https://github.com/atom/atom/pull/11054)
+* [atom/atom#11153 - Fix node env](https://github.com/atom/atom/pull/11153)
+* [atom/atom#11162 - BufferedProcess: search only new data for new lines rather than entire buffer, take 2](https://github.com/atom/atom/pull/11162)
+* [atom/atom#11166 - Note where GitRepositoryAsync deviates from its synchronous predecessor](https://github.com/atom/atom/pull/11166)
+
+### [one-dark-ui](https://github.com/atom/one-dark-ui)
+
+v1.1.9...v1.2.0
+
+* [atom/one-dark-ui#113 - Specify config schema in package.json](https://github.com/atom/one-dark-ui/pull/113)
+* [atom/one-dark-ui#121 - Fix typo in comment for ui-variables.less](https://github.com/atom/one-dark-ui/pull/121)
+
+### [one-light-ui](https://github.com/atom/one-light-ui)
+
+v1.1.9...v1.2.0
+
+* [atom/one-light-ui#48 - Specify config schema in package.json](https://github.com/atom/one-light-ui/pull/48)
+
+### [about](https://github.com/atom/about)
+
+v1.3.0...v1.4.1
+
+* [atom/about#6 - Specify deserializer in package.json](https://github.com/atom/about/pull/6)
+* [atom/about#6 - Specify deserializer in package.json](https://github.com/atom/about/pull/6)
+* [atom/about#13 - Specify deserializer method in package.json, the new way](https://github.com/atom/about/pull/13)
+* [atom/about#12 - Show update information on the about page](https://github.com/atom/about/pull/12)
+* [atom/about#15 - Move away from deprecated Electron require syntax](https://github.com/atom/about/pull/15)
+
+### [archive-view](https://github.com/atom/archive-view)
+
+v0.61.0...v0.61.1
+
+* [atom/archive-view#32 - Specify deserializer in package.json](https://github.com/atom/archive-view/pull/32)
+
+### [autocomplete-plus](https://github.com/atom/autocomplete-plus)
+
+v2.25.0...v2.29.1
+
+* [atom/autocomplete-plus#612 - bugfix: auto indentation after suggestion confirm](https://github.com/atom/autocomplete-plus/pull/612)
+* [atom/autocomplete-plus#641 - Stop flickering when adjusting margins](https://github.com/atom/autocomplete-plus/pull/641)
+* [atom/autocomplete-plus#637 - Move config schema to package.json](https://github.com/atom/autocomplete-plus/pull/637)
+* [atom/autocomplete-plus#659 - Batch autocompletion show/hide](https://github.com/atom/autocomplete-plus/pull/659)
+* [atom/autocomplete-plus#675 - :art: Clean up formatting of fileBlacklist setting description](https://github.com/atom/autocomplete-plus/pull/675)
+* [atom/autocomplete-plus#672 - Redesign SymbolStore and SymbolProvider](https://github.com/atom/autocomplete-plus/pull/672)
+* [atom/autocomplete-plus#667 - Add unicode support for \w regexps](https://github.com/atom/autocomplete-plus/pull/667)
+* [atom/autocomplete-plus#681 - Fix maximum call stack size exceeded error](https://github.com/atom/autocomplete-plus/pull/681)
+
+### [autosave](https://github.com/atom/autosave)
+
+v0.23.0...v0.23.1
+
+* [atom/autosave#56 - Move config schema to package.json](https://github.com/atom/autosave/pull/56)
+
+### [bracket-matcher](https://github.com/atom/bracket-matcher)
+
+v0.79.0...v0.81.0
+
+* [atom/bracket-matcher#196 - Fix spelling in settings](https://github.com/atom/bracket-matcher/pull/196)
+* [atom/bracket-matcher#197 - Move config schema to package.json](https://github.com/atom/bracket-matcher/pull/197)
+* [atom/bracket-matcher#212 - Make updating matches faster for multi-cursor editing](https://github.com/atom/bracket-matcher/pull/212)
+* [atom/bracket-matcher#219 - Clean up view subscriptions when editor is destroyed](https://github.com/atom/bracket-matcher/pull/219)
+* [atom/bracket-matcher#221 - Enable bracket matching for elixir](https://github.com/atom/bracket-matcher/pull/221)
+
+### [deprecation-cop](https://github.com/atom/deprecation-cop)
+
+v0.54.0...v0.54.1
+
+* [atom/deprecation-cop#65 - Move deserializer into package.json](https://github.com/atom/deprecation-cop/pull/65)
+* [atom/deprecation-cop#65 - Move deserializer into package.json](https://github.com/atom/deprecation-cop/pull/65)
+* [atom/deprecation-cop#67 - Specify deserializer method in package.json](https://github.com/atom/deprecation-cop/pull/67)
+
+### [fuzzy-finder](https://github.com/atom/fuzzy-finder)
+
+v0.94.0...v1.0.3
+
+* [atom/fuzzy-finder#160 - Move config schema to package.json](https://github.com/atom/fuzzy-finder/pull/160)
+* [atom/fuzzy-finder#167 - Async git](https://github.com/atom/fuzzy-finder/pull/167)
+* [atom/fuzzy-finder#174 - Fix spec race](https://github.com/atom/fuzzy-finder/pull/174)
+* [atom/fuzzy-finder#178 - Handle symlink project paths](https://github.com/atom/fuzzy-finder/pull/178)
+* [atom/fuzzy-finder#180 - Return project paths correctly if last-opened path is not in project](https://github.com/atom/fuzzy-finder/pull/180)
+
+### [git-diff](https://github.com/atom/git-diff)
+
+v0.57.0...v1.0.1
+
+* [atom/git-diff#81 - Move config schema to package.json](https://github.com/atom/git-diff/pull/81)
+* [atom/git-diff#82 - Async git](https://github.com/atom/git-diff/pull/82)
+* [atom/git-diff#95 - Catch errors from new files.](https://github.com/atom/git-diff/pull/95)
+
+### [grammar-selector](https://github.com/atom/grammar-selector)
+
+v0.48.0...v0.48.1
+
+* [atom/grammar-selector#25 - Add description for config setting](https://github.com/atom/grammar-selector/pull/25)
+* [atom/grammar-selector#29 - Move config schema to package.json](https://github.com/atom/grammar-selector/pull/29)
+
+### [image-view](https://github.com/atom/image-view)
+
+v0.56.0...v0.57.0
+
+* [atom/image-view#40 - Zoom to fit](https://github.com/atom/image-view/pull/40)
+
+### [incompatible-packages](https://github.com/atom/incompatible-packages)
+
+v0.25.0...v0.25.1
+
+* [atom/incompatible-packages#11 - Move deserializer to package.json](https://github.com/atom/incompatible-packages/pull/11)
+* [atom/incompatible-packages#11 - Move deserializer to package.json](https://github.com/atom/incompatible-packages/pull/11)
+* [atom/incompatible-packages#12 - Specify deserializer method in package.json](https://github.com/atom/incompatible-packages/pull/12)
+
+### [keybinding-resolver](https://github.com/atom/keybinding-resolver)
+
+v0.33.0...v0.35.0
+
+* [atom/keybinding-resolver#23 - Update coffeelint support](https://github.com/atom/keybinding-resolver/pull/23)
+* [atom/keybinding-resolver#37 - Show keyup events that match a binding](https://github.com/atom/keybinding-resolver/pull/37)
+
+### [line-ending-selector](https://github.com/atom/line-ending-selector)
+
+v0.3.0...v0.3.1
+
+* [atom/line-ending-selector#17 - Move config schema to package.json](https://github.com/atom/line-ending-selector/pull/17)
+
+### [link](https://github.com/atom/link)
+
+v0.31.0...v0.31.1
+
+* [atom/link#14 - Move away from deprecated Electron require syntax](https://github.com/atom/link/pull/14)
+
+### [markdown-preview](https://github.com/atom/markdown-preview)
+
+v0.157.2...v0.158.0
+
+* [atom/markdown-preview#349 - Use new package.json fields (configSchema and deserializers)](https://github.com/atom/markdown-preview/pull/349)
+* [atom/markdown-preview#349 - Use new package.json fields (configSchema and deserializers)](https://github.com/atom/markdown-preview/pull/349)
+* [atom/markdown-preview#367 - Use new package.json fields to allow deferred loading](https://github.com/atom/markdown-preview/pull/367)
+* [atom/markdown-preview#335 - Use GitHub style when "Save as HTML"](https://github.com/atom/markdown-preview/pull/335)
+
+### [notifications](https://github.com/atom/notifications)
+
+v0.62.1...v0.63.1
+
+* [atom/notifications#105 - Move config schema to package.json](https://github.com/atom/notifications/pull/105)
+* [atom/notifications#111 - Use https://git.io insead of http](https://github.com/atom/notifications/pull/111)
+* [atom/notifications#113 - replace ATOM_HOME in issue title with generic placeholder](https://github.com/atom/notifications/pull/113)
+* [atom/notifications#114 - Use bit.ly instead of git.io.](https://github.com/atom/notifications/pull/114)
+* [atom/notifications#115 - URL shortening, take 2](https://github.com/atom/notifications/pull/115)
+
+### [open-on-github](https://github.com/atom/open-on-github)
+
+v0.41.0...v1.0.1
+
+* [atom/open-on-github#59 - Move config schema to package.json](https://github.com/atom/open-on-github/pull/59)
+* [atom/open-on-github#60 - Async git](https://github.com/atom/open-on-github/pull/60)
+* [atom/open-on-github#66 - Move away from deprecated Electron require syntax](https://github.com/atom/open-on-github/pull/66)
+
+### [package-generator](https://github.com/atom/package-generator)
+
+v0.41.0...v1.0.0
+
+* [atom/package-generator#37 - Move config schema to package.json](https://github.com/atom/package-generator/pull/37)
+* [atom/package-generator#36 - Support JS package generation](https://github.com/atom/package-generator/pull/36)
+
+### [settings-view](https://github.com/atom/settings-view)
+
+v0.232.3...v0.235.0
+
+* [atom/settings-view#731 - Specify deserializer in package.json](https://github.com/atom/settings-view/pull/731)
+* [atom/settings-view#749 - Move away from deprecated Electron require syntax](https://github.com/atom/settings-view/pull/749)
+* [atom/settings-view#750 - Another require fix for remote](https://github.com/atom/settings-view/pull/750)
+* [atom/settings-view#743 - Display and manage Git-based packages](https://github.com/atom/settings-view/pull/743)
+* [atom/settings-view#748 - Add defaults on focus](https://github.com/atom/settings-view/pull/748)
+* [atom/settings-view#736 - Add collapsable section for option groups](https://github.com/atom/settings-view/pull/736)
+
+### [spell-check](https://github.com/atom/spell-check)
+
+v0.65.0...v0.67.0
+
+* [atom/spell-check#103 - Update README.md](https://github.com/atom/spell-check/pull/103)
+* [atom/spell-check#33 - Add feature: toggle on/off](https://github.com/atom/spell-check/pull/33)
+* [atom/spell-check#108 - subscriptionsOfCommands -> commandSubscription](https://github.com/atom/spell-check/pull/108)
+* [atom/spell-check#112 - Move config schema to package.json](https://github.com/atom/spell-check/pull/112)
+* [atom/spell-check#114 - updates spellchecker to use system language](https://github.com/atom/spell-check/pull/114)
+
+### [status-bar](https://github.com/atom/status-bar)
+
+v0.83.0...v1.2.0
+
+* [atom/status-bar#121 - Move config schema to package.json](https://github.com/atom/status-bar/pull/121)
+* [atom/status-bar#114 - Async git](https://github.com/atom/status-bar/pull/114)
+* [atom/status-bar#122 - Make updating info faster for multi-cursor edits](https://github.com/atom/status-bar/pull/122)
+* [atom/status-bar#129 - Hide diff stats for new files](https://github.com/atom/status-bar/pull/129)
+* [atom/status-bar#131 - Fix error with no active item](https://github.com/atom/status-bar/pull/131)
+* [atom/status-bar#133 - Move to the footer](https://github.com/atom/status-bar/pull/133)
+
+### [styleguide](https://github.com/atom/styleguide)
+
+v0.45.1...v0.45.2
+
+* [atom/styleguide#34 - Specify deserializer in package.json](https://github.com/atom/styleguide/pull/34)
+
+### [symbols-view](https://github.com/atom/symbols-view)
+
+v0.110.1...v0.112.0
+
+* [atom/symbols-view#147 - Add support for ES2015 static methods](https://github.com/atom/symbols-view/pull/147)
+* [atom/symbols-view#151 - Specify config schema in package.json](https://github.com/atom/symbols-view/pull/151)
+* [atom/symbols-view#157 - Add es7 async functions to ctags](https://github.com/atom/symbols-view/pull/157)
+
+### [tabs](https://github.com/atom/tabs)
+
+v0.91.3...v0.92.0
+
+* [atom/tabs#134 - Add "open in new window" option to tabs context menu](https://github.com/atom/tabs/pull/134)
+
+### [timecop](https://github.com/atom/timecop)
+
+v0.33.0...v0.33.1
+
+* [atom/timecop#15 - Specify deserializer in package.json](https://github.com/atom/timecop/pull/15)
+
+### [tree-view](https://github.com/atom/tree-view)
+
+v0.201.5...v0.203.2
+
+* [atom/tree-view#754 - Add option to auto-reveal tree view entries when they become the active pane item](https://github.com/atom/tree-view/pull/754)
+* [atom/tree-view#755 - Add `focusOnReveal` option](https://github.com/atom/tree-view/pull/755)
+* [atom/tree-view#695 - Make 'Move in trash' more verbose on failure, add a note for Linux](https://github.com/atom/tree-view/pull/695)
+* [atom/tree-view#769 - Move away from deprecated Electron require syntax](https://github.com/atom/tree-view/pull/769)
+* [atom/tree-view#768 - Fix exception when double clicking opened file after activation](https://github.com/atom/tree-view/pull/768)
+
+### [welcome](https://github.com/atom/welcome)
+
+v0.33.0...v0.34.0
+
+* [atom/welcome#45 - Move config schema to package.json](https://github.com/atom/welcome/pull/45)
+* [atom/welcome#47 - Change menu names for different platforms](https://github.com/atom/welcome/pull/47)
+
+### [whitespace](https://github.com/atom/whitespace)
+
+v0.32.1...v0.32.2
+
+* [atom/whitespace#107 - Move config schema to package.json](https://github.com/atom/whitespace/pull/107)
+
+### [language-clojure](https://github.com/atom/language-clojure)
+
+v0.19.1...v0.20.0
+
+* [atom/language-clojure#39 - Fix tokenization of sexp and map nested at beginning of another sexp](https://github.com/atom/language-clojure/pull/39)
+
+### [language-coffee-script](https://github.com/atom/language-coffee-script)
+
+v0.46.0...v0.46.1
+
+* [atom/language-coffee-script#85 - Check for word boundaries when attempting to auto-indent](https://github.com/atom/language-coffee-script/pull/85)
+
+### [language-csharp](https://github.com/atom/language-csharp)
+
+v0.11.0...v0.12.0
+
+* [atom/language-csharp#53 - Make nameof a keyword](https://github.com/atom/language-csharp/pull/53)
+* [atom/language-csharp#54 - Make C# 6's when a keyword](https://github.com/atom/language-csharp/pull/54)
+
+### [language-gfm](https://github.com/atom/language-gfm)
+
+v0.84.0...v0.85.0
+
+* [atom/language-gfm#140 - Highlight HTML entities inside bold, italic, and strikethrough text](https://github.com/atom/language-gfm/pull/140)
+
+### [language-html](https://github.com/atom/language-html)
+
+v0.44.0...v0.44.1
+
+* [atom/language-html#108 - Fixes #102 - ng-template highlighting for script tags](https://github.com/atom/language-html/pull/108)
+
+### [language-json](https://github.com/atom/language-json)
+
+v0.17.4...v0.17.6
+
+* [atom/language-json#42 - Add .jsonld file support](https://github.com/atom/language-json/pull/42)
+* [atom/language-json#43 - add composer.lock files](https://github.com/atom/language-json/pull/43)
+* [atom/language-json#44 - Add .tern-project and .tern-config to file types](https://github.com/atom/language-json/pull/44)
+
+### [language-ruby](https://github.com/atom/language-ruby)
+
+v0.68.0...v0.68.3
+
+* [atom/language-ruby#135 - Adds cr (Crystal lang) to fileTypes for Ruby grammar](https://github.com/atom/language-ruby/pull/135)
+* [atom/language-ruby#137 - Changes dop and do order priority](https://github.com/atom/language-ruby/pull/137)
+* [atom/language-ruby#136 - Fixes for tokenization of Kernel methods ending in ? or !](https://github.com/atom/language-ruby/pull/136)
+* [atom/language-ruby#140 - Revert do/dop order change](https://github.com/atom/language-ruby/pull/140)
+
+### [language-sass](https://github.com/atom/language-sass)
+
+v0.45.0...v0.46.0
+
+* [atom/language-sass#101 - Add individual border-radius properties](https://github.com/atom/language-sass/pull/101)
+
+### [language-text](https://github.com/atom/language-text)
+
+v0.7.0...v0.7.1
+
+* [atom/language-text#5 - Add travis.yml](https://github.com/atom/language-text/pull/5)
+* [atom/language-text#6 - Update legal date to 2016](https://github.com/atom/language-text/pull/6)
+
+### [language-xml](https://github.com/atom/language-xml)
+
+v0.34.2...v0.34.4
+
+* [atom/language-xml#43 - Fix incorrect highlighting for empty element](https://github.com/atom/language-xml/pull/43)
--- a/docs/build-instructions/linux.md
+++ b/docs/build-instructions/linux.md
@@ -74,18 +74,24 @@ If you have problems with permissions don't forget to prefix with `sudo`

  To use the newly installed Atom, quit and restart all running Atom instances.

-5. *Optionally*, you may generate distributable packages of Atom at `out`. Currently, `.deb` and `.rpm` package types are supported. To create a `.deb` package run:
+5. *Optionally*, you may generate distributable packages of Atom at `out`. Currently, `.deb` and `.rpm` package types are supported, as well as a `.tar.gz` archive. To create a `.deb` package run:

  ```sh
  script/grunt mkdeb
  ```

-  To create an `.rpm` package run
+  To create a `.rpm` package run

  ```sh
  script/grunt mkrpm
  ```

+  To create a `.tar.gz` archive run
+
+  ```sh
+  script/grunt mktar
+  ```
+
 ## Advanced Options

 ### Custom build directory
--- a/docs/build-instructions/windows.md
+++ b/docs/build-instructions/windows.md
@@ -28,15 +28,13 @@ Whichever version you use, ensure that:

 You can run these commands using Command Prompt, PowerShell or Git Shell via [GitHub Desktop](https://desktop.github.com/). These instructions will assume the use of Bash from Git Shell - if you are using Command Prompt use a backslash instead: i.e. `script\build`.

-**VS2015 + Git Shell users** should note that the default path supplied with Git Shell includes reference to an older version of msbuild that will fail. It is recommended you use a PowerShell window that has git in the path at this time.
-
 ```bash
 cd C:\
 git clone https://github.com/atom/atom/
 cd atom
 script/build
 ```
-This will create the Atom application in the `Program Files` folder.
+This will create the Atom application in the `out\Atom` folder as well as copy it to a folder named `Atom` within `Program Files`.

 ### `script/build` Options
  * `--install-dir` - Creates the final built application in this directory. Example (trailing slash is optional):
@@ -47,6 +45,7 @@ This will create the Atom application in the `Program Files` folder.
 ```bash
 ./script/build --build-dir Z:\Some\Temporary\Directory\
 ```
+  * `--no-install` - Skips the installation task after building.
  * `--verbose` - Verbose mode. A lot more information output.

 ## Do I have to use GitHub Desktop?
@@ -69,6 +68,9 @@ If none of this works, do install Github Desktop and use its Git Shell as it mak
 * `msbuild.exe failed with exit code: 1`
   * Ensure you have Visual C++ support installed. Go into Add/Remove Programs, select Visual Studio and press Modify and then check the Visual C++ box.

+* `script/build` stops with no error or warning shortly after displaying the versions of node, npm and Python
+  * Make sure that the path where you have checked out Atom does not include a space. e.g. use `c:\atom` and not `c:\my stuff\atom`
+
 * `script/build` outputs only the Node.js and Python versions before returning
  * Try moving the repository to `C:\atom`. Most likely, the path is too long.
    See [issue #2200](https://github.com/atom/atom/issues/2200).
@@ -88,7 +90,7 @@ If none of this works, do install Github Desktop and use its Git Shell as it mak

 * `error MSB8020: The build tools for Visual Studio 201? (Platform Toolset = 'v1?0') cannot be found.`
  * If you're building Atom with Visual Studio 2013 try setting the `GYP_MSVS_VERSION` environment variable to 2013 and then `script/clean` followed by `script/build` (re-open your command prompt or Powershell window if you set it using the GUI)
-  * 
+
 * Other `node-gyp` errors on first build attempt, even though the right Node.js and Python versions are installed.
  * Do try the build command one more time, as experience shows it often works on second try in many of these cases.

--- a/fsck.txt
+++ b/fsck.txt
@@ -0,0 +1,84 @@
+dangling blob 8e1e50c470eb9e341f51dd728c371ec9e6ba967f
+dangling blob 312880903e5988a36556c71047cfab48f7cabb0a
+dangling commit d14e40a5f4e51d329bf51eed9c5ac405cef8a4e7
+dangling blob ed4f3083f21ee505b90e49bc719126b3a0ca8717
+dangling commit 1981b88bcacc6a68408a7f21c840ebe50a3f76a1
+dangling commit b490508111afcabff3afd35b877f6afa0dd9ed57
+dangling commit 629c78769aa70249e6aceaed24ca5ed02a2b24e2
+dangling blob 3db2f0aa0e9ffeda9f614085d0b55ad3669439f8
+dangling commit 34f8200a8eecf014d43defaf8c6dd4e50e99d2ee
+dangling commit 5d1009b9be44874de85d5cea8bfa8692fb1c9e93
+dangling commit 9b1e51e67ebc5de354858b555eb9b4e4c92bd4dd
+dangling commit 4b8039b1d3f06b0f4e0f00ca195748ee8c1e32ed
+dangling blob 7ca269d19d59fa66955e17e0861eb45652d1ba2d
+dangling blob c8a8a9065ef35c949d666f7e4d7f743218ec6bc7
+dangling blob 9cb1c9364187f4a7665f1c7b5dee3c3fbd8f1c99
+dangling commit eec8e92d898d645a6ce442ae7c35ec9584396c58
+dangling blob dcc9712690f1c859158aebc40a56fbf27e833d76
+dangling blob 1fe2e195f16e0d750d8d995b87b8035a44b381d2
+dangling blob 50e29981374b4dfe0c4262a4cd73aea35ca76315
+dangling blob 8ce7099a661bb3a8f4918ecb57c0279b2bbc5830
+dangling commit 08e8d1fe6d81c1ef46bee56003c93b267bae2bd8
+dangling commit 07f9710adffbd72b6142892662135540826304f4
+dangling blob 52f9e94a0f8773639c2b934c0f6dc1480b857d84
+dangling commit e813da3e669e6ff94efa7ece2b0ff72781b4989d
+dangling commit 0b30da3c7e93250e5b4ad07cf70a1d6477f14f1c
+dangling commit 5d5c9a487e098214b4f956c20b6f6a07aec44954
+dangling commit c5916ad2075a90dc188e612c369affdf1dc0bc23
+dangling commit fe9efa90b53d85c6ee8a7d455f61cab0f1495bb4
+dangling blob 0e9f6a422bd61e3ac86b1317d6b12356328b6d66
+dangling commit 86d8bade0a8e08537f2c6a5f278bc426e3136310
+dangling commit 44fb9a4521e7f05cfb80fcd7057fdf75a9cd57f0
+dangling blob 0efdb238e664cf22a41e19fa327ab5582fba88f9
+dangling commit 5d0aabf92aa8606b08619ee7fc3654f14aa68bad
+dangling commit 2d19dbc0fc42216b8892e261201cc53a378b5d7e
+dangling commit 952263ff6ad07751137586a10b7766d292d1d249
+dangling commit 6d266b46d74b6acab92a3c8787973b46936d9fee
+dangling commit 8346a391ecc5c8cbccecf1da359f3b975173dcf4
+dangling commit 0554dbd09d5d199382f612e9587e9044135e1266
+dangling commit 0f667bdaa3156942835a7f55bca7d116f02bc678
+dangling blob e27e1b3bbda2e7c75cfae7715ece1adec8b7b044
+dangling blob 9b9bbba7c0ef471ef195119db8f3bc2a903c5d5e
+dangling commit 4fa8734a6537b8265064e31be40e1635996a543f
+dangling blob 97b793cd3612ec045881b27477927cfc2a4a2083
+dangling blob 5ceaabe3ccb8c6b2c4ffde8dacb506601431ddbb
+dangling commit eb13c4a2b1ee9854a238463ecc99d27dda8641d5
+dangling commit 14421ccec537f5b034d35bd3a6578c848532d06d
+dangling commit 295d1c1d8df1ebf9c8477686d5a294135c9a413c
+dangling commit 4e96d4ca9770282c120e6ab909f101fb7604999f
+dangling commit e6b82450a1065c2be1313376be900014f98fb340
+dangling blob 4fc1849c928074155f28caa53b06ad61ad5b140e
+dangling commit f7fe343d0a2eb0016b8fdad61512921dabd188db
+dangling commit 0107a55520447e6b24ce224f5c2269c6e9e09f5b
+dangling commit 2f2395435ea382bdf2aaa6f8a9d313bf337dbf96
+dangling commit 7c2ca56b3b5702e3a59c85540bd6c278415071ce
+dangling commit 2d59bdd296fc06664c84ff6aeb98af3346b7b1fb
+dangling blob 3c6a0514c057cd275aeb9df47f7ebbc3da1bcd1f
+dangling blob b08cdddd620140a4bf79f6af455ce11979ecf2c2
+dangling commit a38e850b7648a7cef9d57725a27e298bc7d03cd4
+dangling blob b6af9d9e202c61bda1ac21b66f5d576805c617f6
+dangling commit 40c3bd9d3e7e23e1d6032180b37d5e49d16c0d5c
+dangling commit 34d42d33ccd9cfec6c0aacbf145f4ef37353db98
+dangling commit 1ffdbd581d994dc633c1344747b4da809c400a08
+dangling blob 490d76d4f5acb1b44d7840bc8a3c7bda62d11d07
+dangling commit b72a56ec43568db6d299c1eba54726a6e3cc1c97
+dangling commit 693c0657285beff0d4aaca0641375283c5a56c74
+dangling blob c66026146ba927fc352451448472982845a3727e
+dangling blob 1671d6b83241b80fa4ba87ac8a3644e8dd9dbb23
+dangling blob 6175d60e2dd97a0a67321ca2eeccf567b6c2d988
+dangling commit 9a9deedebdea0ae0b731791ecc08caea0623fa50
+dangling blob d0aa062f7df257a3120025cbbba8aa6b0b31d1bb
+dangling blob 28b82ef47e6226d52364a2a675af3145987d0710
+dangling commit 43ea466643b314b20fe374b64dbd7a47816b962a
+dangling blob 52ebb6f16e8b667cd321dea15461e0d8eb690ad8
+dangling blob 7bf4fec5c7b11c2dbd64556c3422cd4e838e6690
+dangling blob 45f506658f41781d33ec9b975a73c75199ef6757
+dangling blob ee27c707653877b4f644aecce296e68c23438d0f
+dangling commit a357b773b0601eb14cdc921233fd50bb1c3e3286
+dangling commit cd598fcd5927deb5ad8443614c8bd6383ff3a765
+dangling commit 8960cfeed612451e272e9da34ac831c81b7b324c
+dangling commit 3e6def8d1b7eac9fa9b3053d8824440770d01ecf
+dangling commit f0782fb3b7b108201648ddc895e61cee26a2070d
+dangling commit a87a2781ff62ef0810740dba02d70669dc1fa315
+dangling blob 3a7e57e783324bf9b95cf66502675f450c4fb6d0
+dangling blob 1ae10fac3e2c076e3053305ec2785a63a04101d2
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
    "less-cache": "0.23",
    "line-top-index": "0.2.0",
    "marked": "^0.3.4",
-    "nodegit": "0.12.1",
+    "nodegit": "0.12.2",
    "normalize-package-data": "^2.0.0",
    "nslog": "^3",
    "oniguruma": "^5",
@@ -75,23 +75,23 @@
    "about": "1.5.0",
    "archive-view": "0.61.1",
    "autocomplete-atom-api": "0.10.0",
-    "autocomplete-css": "0.11.0",
+    "autocomplete-css": "0.11.1",
    "autocomplete-html": "0.7.2",
-    "autocomplete-plus": "2.29.1",
+    "autocomplete-plus": "2.29.2",
    "autocomplete-snippets": "1.10.0",
    "autoflow": "0.27.0",
    "autosave": "0.23.1",
    "background-tips": "0.26.0",
-    "bookmarks": "0.38.2",
+    "bookmarks": "0.39.0",
    "bracket-matcher": "0.82.0",
    "command-palette": "0.38.0",
    "deprecation-cop": "0.54.1",
    "dev-live-reload": "0.47.0",
    "encoding-selector": "0.21.0",
-    "exception-reporting": "0.37.0",
-    "find-and-replace": "0.197.4",
-    "fuzzy-finder": "1.0.3",
+    "exception-reporting": "0.38.0",
+    "fuzzy-finder": "1.0.4",
    "git-diff": "1.0.1",
+    "find-and-replace": "0.198.0",
    "go-to-line": "0.30.0",
    "grammar-selector": "0.48.1",
    "image-view": "0.57.0",
@@ -106,13 +106,14 @@
    "package-generator": "1.0.0",
    "settings-view": "0.235.1",
    "snippets": "1.0.2",
-    "spell-check": "0.67.0",
-    "status-bar": "1.2.0",
+    "spell-check": "0.67.1",
+    "status-bar": "1.2.3",
    "styleguide": "0.45.2",
    "symbols-view": "0.112.0",
-    "tabs": "0.92.0",
+    "tabs": "0.92.1",
    "timecop": "0.33.1",
-    "tree-view": "0.203.3",
+    "tree-view": "0.203.4",
+    "tree-view": "0.204.0",
    "update-package-dependencies": "0.10.0",
    "welcome": "0.34.0",
    "whitespace": "0.32.2",
@@ -120,8 +121,8 @@
    "language-c": "0.51.3",
    "language-clojure": "0.20.0",
    "language-coffee-script": "0.46.1",
-    "language-csharp": "0.12.0",
-    "language-css": "0.36.0",
+    "language-csharp": "0.12.1",
+    "language-css": "0.36.1",
    "language-gfm": "0.85.0",
    "language-git": "0.12.1",
    "language-go": "0.42.0",
@@ -130,15 +131,15 @@
    "language-java": "0.17.0",
    "language-javascript": "0.110.0",
    "language-json": "0.18.0",
-    "language-less": "0.29.2",
-    "language-make": "0.21.0",
+    "language-less": "0.29.3",
+    "language-make": "0.21.1",
    "language-mustache": "0.13.0",
    "language-objective-c": "0.15.1",
-    "language-perl": "0.32.0",
+    "language-perl": "0.34.0",
    "language-php": "0.37.0",
    "language-property-list": "0.8.0",
    "language-python": "0.43.1",
-    "language-ruby": "0.68.4",
+    "language-ruby": "0.68.5",
    "language-ruby-on-rails": "0.25.0",
    "language-sass": "0.46.0",
    "language-shellscript": "0.21.1",
--- a/script/mktar
+++ b/script/mktar
@@ -0,0 +1,39 @@
+#!/bin/bash
+# mktar name version arch icon-path build-root-path
+
+set -e
+
+SCRIPT=`readlink -f "$0"`
+ROOT=`readlink -f $(dirname $SCRIPT)/..`
+cd $ROOT
+
+NAME="$1"
+VERSION="$2"
+ARCH="$3"
+ICON_FILE="$4"
+BUILD_ROOT_PATH="$5"
+FILE_MODE=755
+
+TAR_PATH=$BUILD_ROOT_PATH
+ATOM_PATH="$BUILD_ROOT_PATH/Atom"
+
+TARGET_ROOT="`mktemp -d`"
+chmod $FILE_MODE "$TARGET_ROOT"
+NAME_IN_TAR="$NAME-$VERSION-$ARCH"
+TARGET="$TARGET_ROOT/$NAME_IN_TAR"
+
+# Copy executable and resources
+cp -a "$ATOM_PATH" "$TARGET"
+
+# Copy icon file
+cp "$ICON_FILE" "$TARGET/$NAME.png"
+
+# Remove executable bit from .node files
+find "$TARGET" -type f -name "*.node" -exec chmod a-x {} \;
+
+# Create the archive
+pushd "$TARGET_ROOT"
+tar caf "$TAR_PATH/$NAME_IN_TAR.tar.gz" "$NAME_IN_TAR"
+popd
+
+rm -rf "$TARGET_ROOT"
--- a/spec/buffered-process-spec.coffee
+++ b/spec/buffered-process-spec.coffee
@@ -88,14 +88,15 @@ describe "BufferedProcess", ->
    describe "when the explorer command is spawned on Windows", ->
      it "doesn't quote arguments of the form /root,C...", ->
        new BufferedProcess({command: 'explorer.exe', args: ['/root,C:\\foo']})
-        expect(ChildProcess.spawn.argsForCall[0][1][2]).toBe '"explorer.exe /root,C:\\foo"'
+        expect(ChildProcess.spawn.argsForCall[0][1][3]).toBe '"explorer.exe /root,C:\\foo"'

    it "spawns the command using a cmd.exe wrapper", ->
      new BufferedProcess({command: 'dir'})
      expect(path.basename(ChildProcess.spawn.argsForCall[0][0])).toBe 'cmd.exe'
      expect(ChildProcess.spawn.argsForCall[0][1][0]).toBe '/s'
-      expect(ChildProcess.spawn.argsForCall[0][1][1]).toBe '/c'
-      expect(ChildProcess.spawn.argsForCall[0][1][2]).toBe '"dir"'
+      expect(ChildProcess.spawn.argsForCall[0][1][1]).toBe '/d'
+      expect(ChildProcess.spawn.argsForCall[0][1][2]).toBe '/c'
+      expect(ChildProcess.spawn.argsForCall[0][1][3]).toBe '"dir"'

  it "calls the specified stdout, stderr, and exit callbacks", ->
    stdout = ''
--- a/spec/pane-spec.coffee
+++ b/spec/pane-spec.coffee
@@ -262,6 +262,26 @@ describe "Pane", ->
      pane.setPendingItem("fake item two")
      expect(callbackCalled).toBeTruthy()

+    it "isn't called when a pending item is replaced with a new one", ->
+      pane = null
+      pendingSpy = jasmine.createSpy("onItemDidTerminatePendingState")
+      destroySpy = jasmine.createSpy("onWillDestroyItem")
+
+      waitsForPromise ->
+        atom.workspace.open('sample.txt', pending: true).then ->
+          pane = atom.workspace.getActivePane()
+
+      runs ->
+        pane.onItemDidTerminatePendingState pendingSpy
+        pane.onWillDestroyItem destroySpy
+
+      waitsForPromise ->
+        atom.workspace.open('sample.js', pending: true)
+
+      runs ->
+        expect(destroySpy).toHaveBeenCalled()
+        expect(pendingSpy).not.toHaveBeenCalled()
+
  describe "::activateNextRecentlyUsedItem() and ::activatePreviousRecentlyUsedItem()", ->
    it "sets the active item to the next/previous item in the itemStack, looping around at either end", ->
      pane = new Pane(paneParams(items: [new Item("A"), new Item("B"), new Item("C"), new Item("D"), new Item("E")]))
--- a/spec/text-editor-component-spec.js
+++ b/spec/text-editor-component-spec.js
@@ -3745,6 +3745,21 @@ describe('TextEditorComponent', function () {
      return event
    }

+    function buildKeydownEvent ({keyCode, target}) {
+      let event = new KeyboardEvent('keydown')
+      Object.defineProperty(event, 'keyCode', {
+        get: function () {
+          return keyCode
+        }
+      })
+      Object.defineProperty(event, 'target', {
+        get: function () {
+          return target
+        }
+      })
+      return event
+    }
+
    let inputNode

    beforeEach(function () {
@@ -3767,11 +3782,12 @@ describe('TextEditorComponent', function () {
      expect(editor.lineTextForBufferRow(0)).toBe('xyvar quicksort = function () {')
    })

-    it('replaces the last character if the length of the input\'s value does not increase, as occurs with the accented character menu', async function () {
-      componentNode.dispatchEvent(buildTextInputEvent({
-        data: 'u',
-        target: inputNode
-      }))
+    it('replaces the last character if a keypress event is bracketed by keydown events with matching keyCodes, which occurs when the accented character menu is shown', async function () {
+      componentNode.dispatchEvent(buildKeydownEvent({keyCode: 85, target: inputNode}))
+      componentNode.dispatchEvent(buildTextInputEvent({data: 'u', target: inputNode}))
+      componentNode.dispatchEvent(new KeyboardEvent('keypress'))
+      componentNode.dispatchEvent(buildKeydownEvent({keyCode: 85, target: inputNode}))
+      componentNode.dispatchEvent(new KeyboardEvent('keyup'))
      await nextViewUpdatePromise()

      expect(editor.lineTextForBufferRow(0)).toBe('uvar quicksort = function () {')
--- a/src/browser/atom-application.coffee
+++ b/src/browser/atom-application.coffee
@@ -466,6 +466,7 @@ class AtomApplication
        openedWindow.restore()
      else
        openedWindow.focus()
+      openedWindow.replaceEnvironment(env)
    else
      if devMode
        try
--- a/src/browser/atom-window.coffee
+++ b/src/browser/atom-window.coffee
@@ -68,6 +68,7 @@ class AtomWindow
      @loaded = true

    @setLoadSettings(loadSettings)
+    @env = loadSettings.env if loadSettings.env?
    @browserWindow.focusOnWebView() if @isSpec
    @browserWindow.temporaryState = {windowDimensions} if windowDimensions?

@@ -169,6 +170,9 @@ class AtomWindow
    else
      @browserWindow.once 'window:loaded', => @openLocations(locationsToOpen)

+  replaceEnvironment: (env) ->
+    @browserWindow.webContents.send 'environment', env
+
  sendMessage: (message, detail) ->
    @browserWindow.webContents.send 'message', message, detail

--- a/src/buffered-process.coffee
+++ b/src/buffered-process.coffee
@@ -67,7 +67,7 @@ class BufferedProcess
        cmdArgs.unshift("\"#{command}\"")
      else
        cmdArgs.unshift(command)
-      cmdArgs = ['/s', '/c', "\"#{cmdArgs.join(' ')}\""]
+      cmdArgs = ['/s', '/d', '/c', "\"#{cmdArgs.join(' ')}\""]
      cmdOptions = _.clone(options)
      cmdOptions.windowsVerbatimArguments = true
      @spawn(@getCmdPath(), cmdArgs, cmdOptions)
--- a/src/environment-helpers.js
+++ b/src/environment-helpers.js
@@ -91,4 +91,12 @@ function normalize (options = {}) {
  }
 }

-export default { getFromShell, needsPatching, normalize }
+function replace (env) {
+  if (!env || !env.PATH) {
+    return
+  }
+
+  process.env = env
+}
+
+export default { getFromShell, needsPatching, normalize, replace }
--- a/src/git-repository-async.js
+++ b/src/git-repository-async.js
@@ -40,7 +40,7 @@ export default class GitRepositoryAsync {

  constructor (_path, options = {}) {
    // We'll serialize our access manually.
-    Git.disableThreadSafety()
+    Git.setThreadSafetyStatus(Git.THREAD_SAFETY.DISABLED)

    this.emitter = new Emitter()
    this.subscriptions = new CompositeDisposable()
@@ -305,7 +305,7 @@ export default class GitRepositoryAsync {
      .then(relativePath => {
        return this.repoPool.enqueue(() => {
          return this.getRepo()
-            .then(repo => repo.openIndex())
+            .then(repo => repo.index())
            .then(index => {
              const entry = index.getByPath(relativePath)
              if (!entry) return false
--- a/src/git-repository.coffee
+++ b/src/git-repository.coffee
@@ -166,7 +166,12 @@ class GitRepository
  #
  # Returns a {Disposable} on which `.dispose()` can be called to unsubscribe.
  onDidChangeStatuses: (callback) ->
-    @async.onDidChangeStatuses callback
+    @async.onDidChangeStatuses ->
+      # Defer the callback to the next tick so that we've reset
+      # `@statusesByPath` by the time it's called. Otherwise reads from within
+      # the callback could be inconsistent.
+      # See https://github.com/atom/atom/issues/11396
+      process.nextTick callback

  ###
  Section: Repository Details
--- a/src/initialize-application-window.coffee
+++ b/src/initialize-application-window.coffee
@@ -4,11 +4,12 @@ module.exports = ({blobStore}) ->
  path = require 'path'
  require './window'
  {getWindowLoadSettings} = require './window-load-settings-helpers'
-
+  {ipcRenderer} = require 'electron'
  {resourcePath, isSpec, devMode, env} = getWindowLoadSettings()

  # Set baseline environment
  environmentHelpers.normalize({env: env})
+  env = process.env

  # Add application-specific exports to module search path.
  exportsPath = path.join(resourcePath, 'exports')
@@ -25,7 +26,7 @@ module.exports = ({blobStore}) ->
    applicationDelegate: new ApplicationDelegate,
    configDirPath: process.env.ATOM_HOME
    enablePersistence: true
-    env: env
+    env: process.env
  })

  atom.startEditorWindow().then ->
@@ -35,3 +36,6 @@ module.exports = ({blobStore}) ->
      window.removeEventListener('focus', windowFocused)
      setTimeout (-> document.querySelector('atom-workspace').focus()), 0
    window.addEventListener('focus', windowFocused)
+    ipcRenderer.on('environment', (event, env) ->
+      environmentHelpers.replace(env)
+    )
--- a/src/pane.coffee
+++ b/src/pane.coffee
@@ -442,15 +442,16 @@ class Pane extends Model
      if typeof item.onDidTerminatePendingState is "function"
        itemSubscriptions.add item.onDidTerminatePendingState =>
          @clearPendingItem() if @getPendingItem() is item
-      itemSubscriptions.add item.onDidDestroy => @removeItem(item, false)
      @subscriptionsPerItem.set item, itemSubscriptions

    @items.splice(index, 0, item)
    lastPendingItem = @getPendingItem()
+    replacingPendingItem = lastPendingItem? and not moved
+    @pendingItem = null if replacingPendingItem
    @setPendingItem(item) if pending

    @emitter.emit 'did-add-item', {item, index, moved}
-    @destroyItem(lastPendingItem) if lastPendingItem? and not moved
+    @destroyItem(lastPendingItem) if replacingPendingItem
    @setActiveItem(item) unless @getActiveItem()?
    item

@@ -458,7 +459,8 @@ class Pane extends Model
    if @pendingItem isnt item
      mostRecentPendingItem = @pendingItem
      @pendingItem = item
-      @emitter.emit 'item-did-terminate-pending-state', mostRecentPendingItem
+      if mostRecentPendingItem?
+        @emitter.emit 'item-did-terminate-pending-state', mostRecentPendingItem

  getPendingItem: =>
    @pendingItem or null
--- a/src/text-editor-component.coffee
+++ b/src/text-editor-component.coffee
@@ -247,9 +247,50 @@ class TextEditorComponent
    @scrollViewNode.addEventListener 'mousedown', @onMouseDown
    @scrollViewNode.addEventListener 'scroll', @onScrollViewScroll

+    @detectAccentedCharacterMenu()
    @listenForIMEEvents()
    @trackSelectionClipboard() if process.platform is 'linux'

+  detectAccentedCharacterMenu: ->
+    # We need to get clever to detect when the accented character menu is
+    # opened on OS X. Usually, every keydown event that could cause input is
+    # followed by a corresponding keypress. However, pressing and holding
+    # long enough to open the accented character menu causes additional keydown
+    # events to fire that aren't followed by their own keypress and textInput
+    # events.
+    #
+    # Therefore, we assume the accented character menu has been deployed if,
+    # before observing any keyup event, we observe events in the following
+    # sequence:
+    #
+    # keydown(keyCode: X), keypress, keydown(keyCode: X)
+    #
+    # The keyCode X must be the same in the keydown events that bracket the
+    # keypress, meaning we're *holding* the _same_ key we intially pressed.
+    # Got that?
+    lastKeydown = null
+    lastKeydownBeforeKeypress = null
+
+    @domNode.addEventListener 'keydown', (event) =>
+      if lastKeydownBeforeKeypress
+        if lastKeydownBeforeKeypress.keyCode is event.keyCode
+          @openedAccentedCharacterMenu = true
+        lastKeydownBeforeKeypress = null
+      else
+        lastKeydown = event
+
+    @domNode.addEventListener 'keypress', =>
+      lastKeydownBeforeKeypress = lastKeydown
+      lastKeydown = null
+
+      # This cancels the accented character behavior if we type a key normally
+      # with the menu open.
+      @openedAccentedCharacterMenu = false
+
+    @domNode.addEventListener 'keyup', ->
+      lastKeydownBeforeKeypress = null
+      lastKeydown = null
+
  listenForIMEEvents: ->
    # The IME composition events work like this:
    #
@@ -266,6 +307,9 @@ class TextEditorComponent

    checkpoint = null
    @domNode.addEventListener 'compositionstart', =>
+      if @openedAccentedCharacterMenu
+        @editor.selectLeft()
+        @openedAccentedCharacterMenu = false
      checkpoint = @editor.createCheckpoint()
    @domNode.addEventListener 'compositionupdate', (event) =>
      @editor.insertText(event.data, select: true)
@@ -321,24 +365,21 @@ class TextEditorComponent

  onTextInput: (event) =>
    event.stopPropagation()
-
-    # If we prevent the insertion of a space character, then the browser
-    # interprets the spacebar keypress as a page-down command.
-    event.preventDefault() unless event.data is ' '
+    event.preventDefault()

    return unless @isInputEnabled()

-    inputNode = event.target
+    # Workaround of the accented character suggestion feature in OS X.
+    # This will only occur when the user is not composing in IME mode.
+    # When the user selects a modified character from the OSX menu, `textInput`
+    # will occur twice, once for the initial character, and once for the
+    # modified character. However, only a single keypress will have fired. If
+    # this is the case, select backward to replace the original character.
+    if @openedAccentedCharacterMenu
+      @editor.selectLeft()
+      @openedAccentedCharacterMenu = false

-    # Work around of the accented character suggestion feature in OS X.
-    # Text input fires before a character is inserted, and if the browser is
-    # replacing the previous un-accented character with an accented variant, it
-    # will select backward over it.
-    selectedLength = inputNode.selectionEnd - inputNode.selectionStart
-    @editor.selectLeft() if selectedLength is 1
-
-    insertedRange = @editor.insertText(event.data, groupUndo: true)
-    inputNode.value = event.data if insertedRange
+    @editor.insertText(event.data, groupUndo: true)

  onVerticalScroll: (scrollTop) =>
    return if @updateRequested or scrollTop is @presenter.getScrollTop()
--- a/src/text-editor.coffee
+++ b/src/text-editor.coffee
@@ -1551,7 +1551,7 @@ class TextEditor extends Model
  #
  # * `markerLayer` A {TextEditorMarkerLayer} or {MarkerLayer} to decorate.
  # * `decorationParams` The same parameters that are passed to
-  #   {decorateMarker}, except the `type` cannot be `overlay` or `gutter`.
+  #   {TextEditor::decorateMarker}, except the `type` cannot be `overlay` or `gutter`.
  #
  # This API is experimental and subject to change on any release.
  #