From 02ab2e858aec34864e522e102f3fe90b57f2ce31 Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Fri, 21 Sep 2012 20:18:25 +0200 Subject: [PATCH] Local key bindings no longer eclipse the default set --- Frameworks/OakTextView/src/OakTextView.mm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Frameworks/OakTextView/src/OakTextView.mm b/Frameworks/OakTextView/src/OakTextView.mm index 7f11ad55..105da53a 100644 --- a/Frameworks/OakTextView/src/OakTextView.mm +++ b/Frameworks/OakTextView/src/OakTextView.mm @@ -867,11 +867,10 @@ static void update_menu_key_equivalents (NSMenu* menu, action_to_key_t const& ac { didLoad = true; - static std::string const localKeyBindings = oak::application_t::support("KeyBindings.dict"); - static std::string const defaultKeyBindings = oak::application_t::path("Contents/Resources/KeyBindings.dict"); static std::string const KeyBindingLocations[] = { - path::exists(localKeyBindings) ? localKeyBindings : defaultKeyBindings, + oak::application_t::support("KeyBindings.dict"), + oak::application_t::path("Contents/Resources/KeyBindings.dict"), path::join(path::home(), "Library/KeyBindings/DefaultKeyBinding.dict"), "/Library/KeyBindings/DefaultKeyBinding.dict", "/System/Library/Frameworks/AppKit.framework/Resources/StandardKeyBinding.dict",