diff options
| author | sqlprodev <sqlprodev@northofthree.com> | 2011-04-14 19:57:45 +0000 |
|---|---|---|
| committer | sqlprodev <sqlprodev@northofthree.com> | 2011-04-14 19:57:45 +0000 |
| commit | 8c2e3126426c0c4c9e5bc2392879a850d3373641 (patch) | |
| tree | 8a6963b5efd578e8586bd808d5f204a81a85c6dc /Source/SPTextView.m | |
| parent | ad7328e56541556d23f527303deddaefd4253ef2 (diff) | |
| download | sequelpro-8c2e3126426c0c4c9e5bc2392879a850d3373641.tar.gz sequelpro-8c2e3126426c0c4c9e5bc2392879a850d3373641.tar.bz2 sequelpro-8c2e3126426c0c4c9e5bc2392879a850d3373641.zip | |
SP_REFACTOR: Workaround for naming conflict with postNotificationOnMainThread: which also exists in TCMPortMapper.framework; NSUserDefaults access now permitted in SP_REFACTOR blocks for a few prefs keys
Diffstat (limited to 'Source/SPTextView.m')
| -rw-r--r-- | Source/SPTextView.m | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/SPTextView.m b/Source/SPTextView.m index 84937e2d..b9ec6459 100644 --- a/Source/SPTextView.m +++ b/Source/SPTextView.m @@ -112,7 +112,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) - (void) awakeFromNib { -#ifndef SP_REFACTOR +#ifndef SP_REFACTOR /* init ivars */ prefs = [[NSUserDefaults standardUserDefaults] retain]; [self setFont:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPCustomQueryEditorFont]]]; #endif @@ -1825,9 +1825,9 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) [theHintString flushCachedRegexData]; #ifndef SP_REFACTOR - // If inside the snippet hint $(…) is defined run … as BASH command - // and replace $(…) by the return string of that command. Please note - // only one $(…) statement is allowed within one ${…} snippet environment. + // If inside the snippet hint $(É) is defined run É as BASH command + // and replace $(É) by the return string of that command. Please note + // only one $(É) statement is allowed within one ${É} snippet environment. NSRange tagRange = [theHintString rangeOfRegex:@"(?s)(?<!\\\\)\\$\\((.*)\\)"]; if(tagRange.length) { [theHintString flushCachedRegexData]; @@ -2129,7 +2129,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) long allFlags = (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask); // Check if user pressed ⌥ to allow composing of accented characters. - // e.g. for US keyboard "⌥ a" to insert ä + // e.g. for US keyboard "⌥u a" to insert ä // or for non-US keyboards to allow to enter dead keys // e.g. for German keyboard ` is a dead key, press space to enter ` if (([theEvent modifierFlags] & allFlags) == NSAlternateKeyMask || [[theEvent characters] length] == 0) |