Merge branch 'master' into ns-mb-detangle-editor

src/application-delegate.coffee

@@ -23,10 +23,10 @@ class ApplicationDelegate
     ipcRenderer.send("call-window-method", "close")
 
   getTemporaryWindowState: ->
-    ipcHelpers.call('get-temporary-window-state')
+    ipcHelpers.call('get-temporary-window-state').then (stateJSON) -> JSON.parse(stateJSON)
 
   setTemporaryWindowState: (state) ->
-    ipcHelpers.call('set-temporary-window-state', state)
+    ipcHelpers.call('set-temporary-window-state', JSON.stringify(state))
 
   getWindowSize: ->
     [width, height] = remote.getCurrentWindow().getSize()

src/package.coffee

@@ -388,6 +388,7 @@ class Package
     @activationPromise = null
     @resolveActivationPromise = null
     @activationCommandSubscriptions?.dispose()
+    @activationHookSubscriptions?.dispose()
     @configSchemaRegisteredOnActivate = false
     @deactivateResources()
     @deactivateKeymaps()

src/tokenized-buffer.coffee

@@ -37,7 +37,7 @@ class TokenizedBuffer extends Model
     @disposables = new CompositeDisposable
     @tokenIterator = new TokenIterator(this)
 
-    @disposables.add @buffer.preemptDidChange (e) => @handleBufferChange(e)
+    @disposables.add @buffer.registerTextDecorationLayer(this)
     @rootScopeDescriptor = new ScopeDescriptor(scopes: ['text.plain'])
 
     @setGrammar(grammar ? NullGrammar)
@@ -73,9 +73,6 @@ class TokenizedBuffer extends Model
   onDidChangeGrammar: (callback) ->
     @emitter.on 'did-change-grammar', callback
 
-  onDidChange: (callback) ->
-    @emitter.on 'did-change', callback
-
   onDidTokenize: (callback) ->
     @emitter.on 'did-tokenize', callback
 
@@ -108,8 +105,6 @@ class TokenizedBuffer extends Model
     @tokenizedLines = new Array(lastRow + 1)
     @invalidRows = []
     @invalidateRow(0)
-    event = {start: 0, end: lastRow, delta: 0}
-    @emitter.emit 'did-change', event
 
   setVisible: (@visible) ->
     @tokenizeInBackground() if @visible
@@ -157,8 +152,6 @@ class TokenizedBuffer extends Model
       @validateRow(endRow)
       @invalidateRow(endRow + 1) unless filledRegion
 
-      event = {start: startRow, end: endRow, delta: 0}
-      @emitter.emit 'did-change', event
       @emitter.emit 'did-invalidate-range', Range(Point(startRow, 0), Point(endRow + 1, 0))
 
     if @firstInvalidRow()?
@@ -194,7 +187,7 @@ class TokenizedBuffer extends Model
       else if row > end
         row + delta
 
-  handleBufferChange: (e) ->
+  bufferDidChange: (e) ->
     if @lastBufferChangeEventId?
       @assert(
         @lastBufferChangeEventId is e.eventId - 1,
@@ -227,9 +220,6 @@ class TokenizedBuffer extends Model
 
     @invalidatedRange = Range(start, end)
 
-    event = {start, end, delta, bufferChange: e}
-    @emitter.emit 'did-change', event
-
   isFoldableAtRow: (row) ->
     if @largeFileMode
       false

src/update-process-env.js

@@ -2,7 +2,11 @@
 
 import {spawnSync} from 'child_process'
 
-const ENVIRONMENT_VARIABLES_TO_PRESERVE = new Set(['NODE_ENV', 'NODE_PATH'])
+const ENVIRONMENT_VARIABLES_TO_PRESERVE = new Set([
+  'NODE_ENV',
+  'NODE_PATH',
+  'ATOM_HOME'
+])
 
 export default function updateProcessEnv (launchEnv) {
   let envToAssign
@@ -32,7 +36,7 @@ export default function updateProcessEnv (launchEnv) {
 function getEnvFromShell () {
   let shell = process.env.SHELL
   if (shell && (shell.endsWith('/bash') || shell.endsWith('/sh'))) {
-    let {stdout} = spawnSync(shell, ['-ilc', 'env'], {encoding: 'utf8'})
+    let {stdout} = spawnSync(shell, ['-ilc', 'command env'], {encoding: 'utf8'})
     if (stdout) {
       let result = {}
       for (let line of stdout.split('\n')) {