Merge branch 'master' of https://github.com/jfmoy/Fraise

sople1 · Nov 18, 2013 · af31a15 · af31a15
2 parents dd78ed9 + 312c9f3
commit af31a15
Show file tree

Hide file tree

Showing 22 changed files with 29,274 additions and 13 deletions.
diff --git a/Classes/FRAProject.m b/Classes/FRAProject.m
@@ -591,7 +591,7 @@ - (void)cleanUpDocument:(id)document
 		[self setFirstDocument:nil];
 	}
 
-	[FRAManagedObjectContext deleteObject:document];
+    [documentsArrayController removeObject:document];
 	[[FRAApplicationDelegate sharedInstance] saveAction:nil]; // To remove it from memory
 	[[FRAManagedObjectContext undoManager] removeAllActions];
 }

diff --git a/Other/SyntaxDefinitions.plist b/Other/SyntaxDefinitions.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <array>
 	<dict>
@@ -43,7 +43,7 @@
 		<string>run mod dat</string>
 	</dict>
 	<dict>
- 		<key>name</key>
+		<key>name</key>
 		<string>Apache</string>
 		<key>file</key>
 		<string>apache</string>
@@ -162,6 +162,14 @@
 		<key>extensions</key>
 		<string>cobol</string>
 	</dict>
+	<dict>
+		<key>name</key>
+		<string>CoffeeScript</string>
+		<key>file</key>
+		<string>coffeescript</string>
+		<key>extensions</key>
+		<string>coffee</string>
+	</dict>
 	<dict>
 		<key>name</key>
 		<string>ColdFusion</string>
@@ -211,13 +219,13 @@
 		<string>e</string>
 	</dict>
 	<dict>
-        <key>name</key>
-        <string>Erlang</string>
-        <key>file</key>
-        <string>erl</string>
-        <key>extensions</key>
-        <string>erl hrl</string>
-    </dict>
+		<key>name</key>
+		<string>Erlang</string>
+		<key>file</key>
+		<string>erl</string>
+		<key>extensions</key>
+		<string>erl hrl</string>
+	</dict>
 	<dict>
 		<key>name</key>
 		<string>eZ Publish</string>
@@ -249,7 +257,7 @@
 		<string>gedcom</string>
 		<key>extensions</key>
 		<string>ged</string>
-	</dict>	
+	</dict>
 	<dict>
 		<key>name</key>
 		<string>GNU Assembler</string>
@@ -538,7 +546,7 @@
 		<key>extensions</key>
 		<string>rb</string>
 	</dict>
-	 	<dict>
+	<dict>
 		<key>name</key>
 		<string>Scala</string>
 		<key>file</key>
@@ -651,4 +659,4 @@
 		<string>xml dtd xsd xsl</string>
 	</dict>
 </array>
-</plist>
+</plist>