The R Project SVN – R-packages – Diff – /trunk/Mac-GUI/RScriptEditorTextView.m

 	if(syntaxHighlightingEnabled) {
 		[self setTextColor:shColorNormal];
 		[self setInsertionPointColor:shColorCursor];
 	} else {
-		[self setTextColor:[NSColor blackColor]];
+		[self setTextColor:shColorNormal];
-		[self setInsertionPointColor:[NSColor blackColor]];
+		[self setInsertionPointColor:shColorCursor];
+	}
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
 	[[self layoutManager] setAllowsNonContiguousLayout:YES];
 #endif
 - (void)setNonSyntaxHighlighting
+{
 	[theTextStorage removeAttribute:NSForegroundColorAttributeName range:NSMakeRange(0, [[theTextStorage string] length])];
 	[theTextStorage removeAttribute:NSBackgroundColorAttributeName range:NSMakeRange(0, [[theTextStorage string] length])];
-	[self setTextColor:[NSColor blackColor]];
+	[self setTextColor:shColorNormal];
-	[self setInsertionPointColor:[NSColor blackColor]];
+	[self setInsertionPointColor:shColorCursor];
 	[self setNeedsDisplayInRect:[self visibleRect]];
+}
 /**
  * This method is called as part of Key Value Observing which is used to watch for prefernce changes which effect the interface.
 								object:nil];
 		// Improve undo behaviour, i.e. it depends how fast the user types
 		[self performSelector:@selector(breakUndoCoalescing) withObject:nil afterDelay:0.8f];
+		[NSObject cancelPreviousPerformRequestsWithTarget:(RDocumentWinCtrl*)[self delegate]
+								selector:@selector(functionRescan)
+								object:nil];
+		// update function list to display the function in which the cursor is located
+		[(RDocumentWinCtrl*)[self delegate] performSelector:@selector(functionRescan) withObject:nil afterDelay:0.3f];
+	}
 	deleteBackward = NO;
 	startListeningToBoundChanges = YES;

The R Project SVN R-packages

(root)/trunk/Mac-GUI/RScriptEditorTextView.m – Rev 6263 → 6274