From 42362e6ce96797f9f41ca447a5785304f4f6d764 Mon Sep 17 00:00:00 2001
From: probablycorey <cj@github.com>
Date: Fri, 25 Oct 2013 16:12:08 -0700
Subject: [PATCH] Load user-keymap.cson instead of keymaps dir

---
 src/keymap.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/keymap.coffee b/src/keymap.coffee
index 69525dfa7..94f84b9dc 100644
--- a/src/keymap.coffee
+++ b/src/keymap.coffee
@@ -37,7 +37,8 @@ class Keymap
     @emit('bundled-keymaps-loaded')
 
   loadUserKeymaps: ->
-    @loadDirectory(path.join(config.configDirPath, 'keymaps'))
+    userKeymapPath = path.join(config.configDirPath, 'keymap.cson')
+    @load(userKeymapPath) if fsUtils.exists(userKeymapPath)
 
   loadDirectory: (directoryPath) ->
     @load(filePath) for filePath in fsUtils.listSync(directoryPath, ['.cson', '.json'])