diff options
| author | rowanbeentje <rowan@beent.je> | 2013-02-13 00:02:42 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2013-02-13 00:02:42 +0000 |
| commit | c37936d71c9c8ad9b721e33899bb118032466896 (patch) | |
| tree | 57e6a4e012d148367278821a9902897e8cb0686e /Source/SPTextView.m | |
| parent | 4be04fd8fd3035dd77d44851d9470d8328a3af74 (diff) | |
| parent | 3a440aa512f3524545dc0b1ec39362d052ed4806 (diff) | |
| download | sequelpro-c37936d71c9c8ad9b721e33899bb118032466896.tar.gz sequelpro-c37936d71c9c8ad9b721e33899bb118032466896.tar.bz2 sequelpro-c37936d71c9c8ad9b721e33899bb118032466896.zip | |
- Merge in changes from 1.0.x release branch to trunk
Diffstat (limited to 'Source/SPTextView.m')
| -rw-r--r-- | Source/SPTextView.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/SPTextView.m b/Source/SPTextView.m index 39398a46..9a29460e 100644 --- a/Source/SPTextView.m +++ b/Source/SPTextView.m @@ -1476,7 +1476,7 @@ static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NS [possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys: field, @"display", @"field-small-square", @"image", - [NSString stringWithFormat:@"%@@%%@",currentTable,currentDb], @"path", SPUniqueSchemaDelimiter, + [NSString stringWithFormat:@"%@%@%@", currentTable, SPUniqueSchemaDelimiter, currentDb], @"path", t, @"type", lst, @"list", @"", @"isRef", @@ -1485,7 +1485,7 @@ static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NS [possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys: field, @"display", @"field-small-square", @"image", - [NSString stringWithFormat:@"%@%@%@",currentTable,currentDb], @"path", SPUniqueSchemaDelimiter, + [NSString stringWithFormat:@"%@%@%@", currentTable, SPUniqueSchemaDelimiter, currentDb], @"path", typ, @"type", @"", @"isRef", nil]]; @@ -3240,7 +3240,7 @@ static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NS NSUInteger currentSelectionLength = [self selectedRange].length; // If selection started/ended, redraw the background in the current query area - if ([self shouldHiliteQuery] && (currentSelectionLength && !proposedSelRange.length) || (!currentSelectionLength && proposedSelRange.length)) { + if ([self shouldHiliteQuery] && ((currentSelectionLength && !proposedSelRange.length) || (!currentSelectionLength && proposedSelRange.length))) { NSUInteger i = 0, rectCount = 0; NSRect* rectsToUpdate = [[self layoutManager] rectArrayForCharacterRange:[self queryRange] withinSelectedCharacterRange:[self queryRange] |