From 773891cd47c0c047b2ca7749ee032b5388f93912 Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Tue, 9 Apr 2013 23:56:34 +0700 Subject: [PATCH] Introduce global setting to disable typing pairs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is presently only settable via the ‘disableTypingPairs’ user defaults key: defaults write com.macromates.TextMate.preview disableTypingPairs -bool YES Closes #609. --- Frameworks/OakTextView/src/OakTextView.mm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Frameworks/OakTextView/src/OakTextView.mm b/Frameworks/OakTextView/src/OakTextView.mm index 3d07245d..03d57fcb 100644 --- a/Frameworks/OakTextView/src/OakTextView.mm +++ b/Frameworks/OakTextView/src/OakTextView.mm @@ -47,8 +47,9 @@ OAK_DEBUG_VAR(OakTextView_Macros); int32_t const NSWrapColumnWindowWidth = 0; int32_t const NSWrapColumnAskUser = -1; -NSString* const kUserDefaultsDisableAntiAliasKey = @"disableAntiAlias"; -NSString* const kUserDefaultsScrollPastEndKey = @"scrollPastEnd"; +NSString* const kUserDefaultsDisableAntiAliasKey = @"disableAntiAlias"; +NSString* const kUserDefaultsDisableTypingPairsKey = @"disableTypingPairs"; +NSString* const kUserDefaultsScrollPastEndKey = @"scrollPastEnd"; @interface OakTextView () + (NSArray*)dropTypes; @@ -1405,7 +1406,7 @@ static void update_menu_key_equivalents (NSMenu* menu, action_to_key_t const& ac } [self recordSelector:_cmd withArgument:[aString copy]]; - bool autoPairing = !macroRecordingArray; + bool autoPairing = !macroRecordingArray && ![[NSUserDefaults standardUserDefaults] boolForKey:kUserDefaultsDisableTypingPairsKey]; editor->insert_with_pairing([aString UTF8String], [self continuousIndentCorrections], autoPairing, to_s([self scopeAttributes])); }