diff options
| author | Max <post@wickenrode.com> | 2014-09-18 22:52:37 +0200 |
|---|---|---|
| committer | Max <post@wickenrode.com> | 2014-09-18 22:52:37 +0200 |
| commit | ba8ed46081716063f17521a8b8cece9889765a57 (patch) | |
| tree | 5331dc52f789018983a69fd352a9262126d9c9af | |
| parent | a86bed3db5f1f5528b9ce38052373286719c2313 (diff) | |
| parent | 6802d5d02a687342edc4af4e90f8d75bdf65b64e (diff) | |
| download | sequelpro-ba8ed46081716063f17521a8b8cece9889765a57.tar.gz sequelpro-ba8ed46081716063f17521a8b8cece9889765a57.tar.bz2 sequelpro-ba8ed46081716063f17521a8b8cece9889765a57.zip | |
Merge branch 'disable_smartquotes' of https://github.com/uxp/sequelpro into uxp-disable_smartquotes
| -rw-r--r-- | Source/SPQueryController.m | 2 | ||||
| -rw-r--r-- | Source/SPTextView.m | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Source/SPQueryController.m b/Source/SPQueryController.m index 01cb50e1..718a5ff3 100644 --- a/Source/SPQueryController.m +++ b/Source/SPQueryController.m @@ -338,7 +338,7 @@ static SPQueryController *sharedQueryController = nil; #pragma mark Other /** - * Called whenver the test within the search field changes. + * Called whenever the text within the search field changes. */ - (void)controlTextDidChange:(NSNotification *)notification { diff --git a/Source/SPTextView.m b/Source/SPTextView.m index 8edbb6d0..abe89c5b 100644 --- a/Source/SPTextView.m +++ b/Source/SPTextView.m @@ -202,6 +202,9 @@ static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NS [self _setTextSelectionColor:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPCustomQueryEditorSelectionColor]] onBackgroundColor:backgroundColor]; + [self setAutomaticDashSubstitutionEnabled:NO]; // prevents -- from becoming —, the em dash. + [self setAutomaticQuoteSubstitutionEnabled:NO]; // prevents ' and " from becoming ‘, ’ and “, ” respectively. + // Register observers for the when editor background colors preference changes [prefs addObserver:self forKeyPath:SPCustomQueryEditorSelectionColor options:NSKeyValueObservingOptionNew context:NULL]; [prefs addObserver:self forKeyPath:SPCustomQueryEditorCaretColor options:NSKeyValueObservingOptionNew context:NULL]; |