Merge pull request #9831 from atom/as-user-keybindings-priority

Do not override user-defined keymaps when reloading packages
This commit is contained in:
Antonio Scandurra
2015-12-04 21:34:20 +01:00
3 changed files with 53 additions and 2 deletions

View File

@@ -32,7 +32,7 @@ KeymapManager::loadUserKeymap = ->
return unless fs.isFileSync(userKeymapPath)
try
@loadKeymap(userKeymapPath, watch: true, suppressErrors: true)
@loadKeymap(userKeymapPath, watch: true, suppressErrors: true, priority: 100)
catch error
if error.message.indexOf('Unable to watch path') > -1
message = """