diff --git a/src/app/keymaps/apple.cson b/keymaps/apple.cson similarity index 100% rename from src/app/keymaps/apple.cson rename to keymaps/apple.cson diff --git a/src/app/keymaps/atom.cson b/keymaps/atom.cson similarity index 100% rename from src/app/keymaps/atom.cson rename to keymaps/atom.cson diff --git a/src/app/keymaps/editor.cson b/keymaps/editor.cson similarity index 100% rename from src/app/keymaps/editor.cson rename to keymaps/editor.cson diff --git a/src/app/keymaps/emacs.cson b/keymaps/emacs.cson similarity index 100% rename from src/app/keymaps/emacs.cson rename to keymaps/emacs.cson diff --git a/src/app/keymaps/git.cson b/keymaps/git.cson similarity index 100% rename from src/app/keymaps/git.cson rename to keymaps/git.cson diff --git a/src/app/keymaps/select-list.cson b/keymaps/select-list.cson similarity index 100% rename from src/app/keymaps/select-list.cson rename to keymaps/select-list.cson diff --git a/src/app/config.coffee b/src/app/config.coffee index ecd42faf4..a358f51c8 100644 --- a/src/app/config.coffee +++ b/src/app/config.coffee @@ -10,6 +10,7 @@ pathWatcher = require 'pathwatcher' configDirPath = fsUtils.absolute("~/.atom") nodeModulesDirPath = path.join(resourcePath, "node_modules") bundledThemesDirPath = path.join(resourcePath, "themes") +bundledKeymapsDirPath = path.join(resourcePath, "keymaps") userThemesDirPath = path.join(configDirPath, "themes") userPackagesDirPath = path.join(configDirPath, "packages") userPackageDirPaths = [userPackagesDirPath] @@ -25,6 +26,7 @@ class Config configDirPath: configDirPath themeDirPaths: [userThemesDirPath, bundledThemesDirPath] bundledPackageDirPaths: [nodeModulesDirPath] + bundledKeymapsDirPath: bundledKeymapsDirPath nodeModulesDirPath: nodeModulesDirPath packageDirPaths: _.clone(userPackageDirPaths) userPackageDirPaths: userPackageDirPaths diff --git a/src/app/keymap.coffee b/src/app/keymap.coffee index 38a0ebe3f..f4b437878 100644 --- a/src/app/keymap.coffee +++ b/src/app/keymap.coffee @@ -36,7 +36,7 @@ class Keymap $(document).command 'toggle-dev-tools', => atom.toggleDevTools() loadBundledKeymaps: -> - @loadDirectory(fsUtils.resolveOnLoadPath('keymaps')) + @loadDirectory(config.bundledKeymapsDirPath) loadUserKeymaps: -> @loadDirectory(path.join(config.configDirPath, 'keymaps'))