All keybindings are stored in the src/keybindings folder now

spec/spec-helper.coffee

@@ -8,7 +8,6 @@ require 'window'
 window.showConsole()
 
 beforeEach ->
-  window.keymap = new Keymap
   window.resetTimeouts()
 
 afterEach ->

src/atom/command-panel.coffee

@@ -16,12 +16,6 @@ class CommandPanel extends View
 
   initialize: ({@rootView})->
     requireStylesheet 'command-panel.css'
-    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'
 
     @commandInterpreter = new CommandInterpreter()
     @history = []

src/atom/editor.coffee

@@ -41,8 +41,6 @@ class Editor extends View
   initialize: ({buffer}) ->
     requireStylesheet 'editor.css'
     requireStylesheet 'theme/twilight.css'
-    require 'keybindings/emacs'
-    require 'keybindings/apple'
 
     @id = Editor.idCounter++
     @editSessionsByBufferId = {}
@@ -53,31 +51,6 @@ class Editor extends View
     @autoIndent = true
 
   bindKeys: ->
-    window.keymap.bindKeys '.editor',
-      'meta-s': 'save'
-      right: 'move-right'
-      left: 'move-left'
-      down: 'move-down'
-      up: 'move-up'
-      'shift-right': 'select-right'
-      'shift-left': 'select-left'
-      'shift-up': 'select-up'
-      'shift-down': 'select-down'
-      enter: 'newline'
-      backspace: 'backspace'
-      'delete': 'delete'
-      'meta-x': 'cut'
-      'meta-c': 'copy'
-      'meta-v': 'paste'
-      'meta-z': 'undo'
-      'meta-Z': 'redo'
-      'alt-meta-w': 'toggle-soft-wrap'
-      'alt-meta-f': 'fold-selection'
-      'alt-meta-left': 'split-left'
-      'alt-meta-right': 'split-right'
-      'alt-meta-up': 'split-up'
-      'alt-meta-down': 'split-down'
-
     @on 'save', => @save()
     @on 'move-right', => @moveCursorRight()
     @on 'move-left', => @moveCursorLeft()

src/atom/file-finder.coffee

@@ -19,9 +19,6 @@ class FileFinder extends View
     @previousFocusedElement = $(document.activeElement)
 
     @populatePathList()
-    window.keymap.bindKeys ".file-finder .editor",
-      'enter': 'file-finder:select-file',
-      'escape': 'file-finder:close'
 
     @on 'file-finder:close', => @remove()
     @on 'move-up', => @moveUp()

src/atom/keymaps/command-panel.coffee

@@ -0,0 +1,9 @@
+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'

src/atom/keymaps/editor.coffee

@@ -0,0 +1,30 @@
+window.keymap.bindKeys '*'
+  'meta-s': 'save'
+  'meta-w': 'close'
+  'alt-meta-i': 'show-console'
+  'meta-f': 'find-in-file'
+
+window.keymap.bindKeys '.editor',
+  'meta-s': 'save'
+  right: 'move-right'
+  left: 'move-left'
+  down: 'move-down'
+  up: 'move-up'
+  'shift-right': 'select-right'
+  'shift-left': 'select-left'
+  'shift-up': 'select-up'
+  'shift-down': 'select-down'
+  enter: 'newline'
+  backspace: 'backspace'
+  'delete': 'delete'
+  'meta-x': 'cut'
+  'meta-c': 'copy'
+  'meta-v': 'paste'
+  'meta-z': 'undo'
+  'meta-Z': 'redo'
+  'alt-meta-w': 'toggle-soft-wrap'
+  'alt-meta-f': 'fold-selection'
+  'alt-meta-left': 'split-left'
+  'alt-meta-right': 'split-right'
+  'alt-meta-up': 'split-up'
+  'alt-meta-down': 'split-down'

src/atom/keymaps/file-finder.coffee

@@ -0,0 +1,6 @@
+window.keymap.bindKeys '*'
+  'meta-t': 'toggle-file-finder'
+
+window.keymap.bindKeys ".file-finder .editor",
+  'enter': 'file-finder:select-file',
+  'escape': 'file-finder:close'

src/atom/root-view.coffee

@@ -22,14 +22,6 @@ class RootView extends View
     @editors = []
     @createProject(path)
 
-    window.keymap.bindKeys '*'
-      'meta-s': 'save'
-      'meta-w': 'close'
-      'meta-t': 'toggle-file-finder'
-      'meta-:': 'command-panel:toggle'
-      'alt-meta-i': 'show-console'
-      'meta-f': 'find-in-file'
-
     @on 'toggle-file-finder', => @toggleFileFinder()
     @on 'show-console', -> window.showConsole()
     @on 'find-in-file', =>

src/atom/window.coffee

@@ -1,23 +1,26 @@
+# This a weirdo file. We don't create a Window class, we just add stuff to
+# the DOM window.
+
 fs = require 'fs'
 _ = require 'underscore'
 $ = require 'jquery'
 
-Keymap = require 'keymap'
-RootView = require 'root-view'
-
-require 'jquery-extensions'
-require 'underscore-extensions'
-
-# This a weirdo file. We don't create a Window class, we just add stuff to
-# the DOM window.
-
 windowAdditions =
   rootViewParentSelector: 'body'
   rootView: null
   keymap: null
 
+  setUpKeymap: ->
+    Keymap = require 'keymap'
+
+    @keymap = new Keymap()
+    @keymap.bindDefaultKeys()
+    require(keymapPath) for keymapPath in fs.list(require.resolve("keymaps"))
+
+    @_handleKeyEvent = (e) => @keymap.handleKeyEvent(e)
+    $(document).on 'keydown', @_handleKeyEvent
+
   startup: (path) ->
-    @setUpKeymap()
     @attachRootView(path)
     @loadUserConfiguration()
     $(window).on 'close', => @close()
@@ -29,18 +32,6 @@ windowAdditions =
     $(window).unbind('focus')
     $(window).unbind('blur')
     atom.windowClosed this
-    @tearDownKeymap()
-
-  setUpKeymap: ->
-    @keymap = new Keymap()
-    @keymap.bindDefaultKeys()
-
-    @_handleKeyEvent = (e) => @keymap.handleKeyEvent(e)
-    $(document).on 'keydown', @_handleKeyEvent
-
-  tearDownKeymap: ->
-    @keymap.unbindDefaultKeys()
-    $(document).off 'keydown', @_handleKeyEvent
 
   attachRootView: (path) ->
     @rootView = new RootView {path}
@@ -65,9 +56,13 @@ windowAdditions =
   onerror: ->
     @showConsole()
 
-for key, value of windowAdditions
-  console.warn "DOMWindow already has a key named `#{key}`" if window[key]
-  window[key] = value
+window[key] = value for key, value of windowAdditions
+window.setUpKeymap()
+
+RootView = require 'root-view'
+
+require 'jquery-extensions'
+require 'underscore-extensions'
 
 requireStylesheet 'reset.css'
 requireStylesheet 'atom.css'