Merge branch 'master' of github.com:github/atom

src/app/keymaps/autocomplete.coffee

@@ -1,6 +0,0 @@
-window.keymap.bindKeys '.editor',
-  'escape': 'autocomplete:attach'
-
-window.keymap.bindKeys '.autocomplete .editor',
-  'enter': 'autocomplete:confirm'
-  'escape': 'autocomplete:cancel'

src/app/keymaps/command-panel.coffee

@@ -1,12 +0,0 @@
-window.keymap.bindKeys '*'
-  'meta-:': 'command-panel:toggle'
-
-window.keymap.bindKeys '.command-panel .editor',
-  escape: 'command-panel:toggle'
-  enter: 'command-panel:execute'
-
-window.keymap.bindKeys '.editor',
-  'meta-g': 'command-panel:repeat-relative-address'
-  'meta-G': 'command-panel:repeat-relative-address-in-reverse'
-  'meta-e': 'command-panel:set-selection-as-regex-address'
-  'meta-f': 'command-panel:find-in-file'

src/app/keymaps/fuzzy-finder.coffee

@@ -1,7 +0,0 @@
-window.keymap.bindKeys '*'
-  'meta-t': 'fuzzy-finder:toggle-file-finder'
-  'meta-b': 'fuzzy-finder:toggle-buffer-finder'
-
-window.keymap.bindKeys ".fuzzy-finder .editor",
-  'enter': 'fuzzy-finder:select-path',
-  'escape': 'fuzzy-finder:cancel'

src/app/keymaps/keybindings-view.coffee

@@ -1,5 +0,0 @@
-window.keymap.bindKeys '*',
-  'ctrl-?': 'keybindings-view:attach'
-
-window.keymap.bindKeys ".keybindings-view",
-  'escape': 'keybindings-view:detach'

src/app/keymaps/snippets.coffee

@@ -1,6 +0,0 @@
-window.keymap.bindKeys '.editor'
-  'tab': 'snippets:expand'
-
-window.keymap.bindKeys '.editor'
-  'tab': 'snippets:next-tab-stop'
-  'shift-tab': 'snippets:previous-tab-stop'

src/app/keymaps/tree-view.coffee

@@ -1,17 +0,0 @@
-window.keymap.bindKeys '#root-view'
-  'alt-tab': 'tree-view:focus'
-  'ctrl-T': 'tree-view:toggle'
-
-window.keymap.bindKeys '.tree-view'
-  'right': 'tree-view:expand-directory'
-  'left': 'tree-view:collapse-directory'
-  'enter': 'tree-view:open-selected-entry'
-  'm': 'tree-view:move'
-  'a': 'tree-view:add'
-  'delete': 'tree-view:remove'
-  'backspace': 'tree-view:remove'
-  'alt-tab': 'tree-view:unfocus'
-
-window.keymap.bindKeys '.tree-view-dialog .mini.editor'
-  'enter': 'tree-view:confirm'
-  'escape': 'tree-view:cancel'

src/app/window.coffee

@@ -55,6 +55,15 @@ windowAdditions =
     return if $("head style[path='#{fullPath}']").length
     $('head').append "<style path='#{fullPath}'>#{content}</style>"
 
+  requireExtension: (name) ->
+    extensionPath = require.resolve name
+    extension = rootView.activateExtension require(extensionPath)
+
+    extensionKeymapPath = fs.join(fs.directory(extensionPath), "keymap.coffee")
+    require extensionKeymapPath if fs.exists(extensionKeymapPath)
+
+    extension
+
   reload: ->
     if rootView.getModifiedBuffers().length > 0
       message = "There are unsaved buffers, reload anyway?"