aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/CMTextView.m4
-rw-r--r--Source/SPEditorTokens.h (renamed from Source/tokens.h)2
-rw-r--r--Source/SPEditorTokens.l (renamed from Source/tokens.l)4
-rw-r--r--Source/TableSource.m2
4 files changed, 6 insertions, 6 deletions
diff --git a/Source/CMTextView.m b/Source/CMTextView.m
index cd00cafb..d62783da 100644
--- a/Source/CMTextView.m
+++ b/Source/CMTextView.m
@@ -27,7 +27,7 @@
/*
all the extern variables and prototypes required for flex (used for syntax highlighting)
*/
-#import "tokens.h"
+#import "SPEditorTokens.h"
extern int yylex();
extern int yyuoffset, yyuleng;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
@@ -86,7 +86,7 @@ YY_BUFFER_STATE yy_scan_string (const char *);
/*
List of keywords for autocompletion. If you add a keyword here,
-it should also be added to the flex file tokens.l
+it should also be added to the flex file SPEditorTokens.l
*/
-(NSArray *)keywords {
return [NSArray arrayWithObjects:
diff --git a/Source/tokens.h b/Source/SPEditorTokens.h
index ff4b70b0..1d854e10 100644
--- a/Source/tokens.h
+++ b/Source/SPEditorTokens.h
@@ -1,5 +1,5 @@
/*
- * tokens.h
+ * SPEditorTokens.h
* sequel-pro
*
* Created by Jakob on 3/15/09.
diff --git a/Source/tokens.l b/Source/SPEditorTokens.l
index 7aa80ed4..08e84d7d 100644
--- a/Source/tokens.l
+++ b/Source/SPEditorTokens.l
@@ -1,7 +1,7 @@
%{
/*
- * tokens.l - created by Jakob on 3/15/09 for Sequel Pro
+ * SPEditorTokens.l - created by Jakob on 3/15/09 for Sequel Pro
*
* This is the lex file used for syntax coloring.
* To add new keywords, just add a line where the other
@@ -14,7 +14,7 @@
* available. (type 'info flex' in the Terminal)
*/
-#import "tokens.h"
+#import "SPEditorTokens.h"
int utf8strlen(const char *s);
int yyuoffset, yyuleng;
diff --git a/Source/TableSource.m b/Source/TableSource.m
index 692fa98e..117ce99b 100644
--- a/Source/TableSource.m
+++ b/Source/TableSource.m
@@ -1118,7 +1118,7 @@ traps enter and esc and make/cancel editing without entering next row
- (void)tableView:(NSTableView *)tableView willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex {
//make sure that the message is from the right table view
- if (tableView!=tableSourceView) return NO;
+ if (tableView!=tableSourceView) return;
[aCell setEnabled:([tablesListInstance tableType] == SP_TABLETYPE_TABLE)];
}