Merge remote-tracking branch 'origin/master' into cj-remove-deprecated-calls

Conflicts:
	package.json

package.json

@@ -30,7 +30,6 @@
     "grim": "0.6.0",
     "guid": "0.0.10",
     "jasmine-tagged": "^1.1.1",
-    "keytar": "1.x",
     "less-cache": "0.12.0",
     "mixto": "1.x",
     "mkdirp": "0.3.5",
@@ -73,7 +72,7 @@
     "command-palette": "0.20.0",
     "dev-live-reload": "0.30.0",
     "exception-reporting": "0.17.0",
-    "feedback": "0.29.0",
+    "feedback": "0.30.0",
     "find-and-replace": "0.98.0",
     "fuzzy-finder": "0.50.0",
     "git-diff": "0.28.0",

src/atom.coffee

@@ -1,6 +1,5 @@
 crypto = require 'crypto'
 ipc = require 'ipc'
-keytar = require 'keytar'
 os = require 'os'
 path = require 'path'
 remote = require 'remote'
@@ -484,17 +483,6 @@ class Atom extends Model
   isReleasedVersion: ->
     @constructor.isReleasedVersion()
 
-  getGitHubAuthTokenName: ->
-    'Atom GitHub API Token'
-
-  # Public: Set the the github token in the keychain
-  setGitHubAuthToken: (token) ->
-    keytar.replacePassword(@getGitHubAuthTokenName(), 'github', token)
-
-  # Public: Get the github token from the keychain
-  getGitHubAuthToken: ->
-    keytar.getPassword(@getGitHubAuthTokenName(), 'github')
-
   # Public: Get the directory path to Atom's configuration area.
   #
   # Returns the absolute path to ~/.atom

src/editor-view.coffee

@@ -527,7 +527,7 @@ class EditorView extends View
 
     if @editor
       @saveScrollPositionForEditor()
-      @editor.off(".editor")
+      @unsubscribe(@editor)
 
     @editor = editor
 
@@ -535,34 +535,34 @@ class EditorView extends View
 
     @editor.setVisible(true)
 
-    @editor.on "destroyed", =>
+    @subscribe @editor, "destroyed", =>
       @remove()
 
-    @editor.on "contents-conflicted.editor", =>
+    @subscribe @editor, "contents-conflicted", =>
       @showBufferConflictAlert(@editor)
 
-    @editor.on "path-changed.editor", =>
+    @subscribe @editor, "path-changed", =>
       @editor.reloadGrammar()
       @trigger 'editor:path-changed'
 
-    @editor.on "grammar-changed.editor", =>
+    @subscribe @editor, "grammar-changed", =>
       @trigger 'editor:grammar-changed'
 
-    @editor.on 'selection-added.editor', (selection) =>
+    @subscribe @editor, 'selection-added', (selection) =>
       @newCursors.push(selection.cursor)
       @newSelections.push(selection)
       @requestDisplayUpdate()
 
-    @editor.on 'screen-lines-changed.editor', (e) =>
+    @subscribe @editor, 'screen-lines-changed', (e) =>
       @handleScreenLinesChange(e)
 
-    @editor.on 'scroll-top-changed.editor', (scrollTop) =>
+    @subscribe @editor, 'scroll-top-changed', (scrollTop) =>
       @scrollTop(scrollTop)
 
-    @editor.on 'scroll-left-changed.editor', (scrollLeft) =>
+    @subscribe @editor, 'scroll-left-changed', (scrollLeft) =>
       @scrollLeft(scrollLeft)
 
-    @editor.on 'soft-wrap-changed.editor', (softWrap) =>
+    @subscribe @editor, 'soft-wrap-changed', (softWrap) =>
       @setSoftWrap(softWrap)
 
     @trigger 'editor:path-changed'