• recognize and match diff files produced by Perforce and give the la…

…nguage grammar a key equivalent (patch by Gerd Knops) git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@2679 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
textmate · Feb 7, 2006 · 91463a2 · 91463a2
1 parent 01e3cd1
commit 91463a2
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Syntaxes/Diff.plist b/Syntaxes/Diff.plist
@@ -8,7 +8,9 @@
 		<string>patch</string>
 	</array>
 	<key>firstLineMatch</key>
-	<string>^(Index: |--- [^%]|\*\*\* |\d+(,\d+)*(a|d|c)\d+(,\d+)*$)</string>
+	<string>^(====\s*//.+\s-\s.+\s+====|Index: |--- [^%]|\*\*\* |\d+(,\d+)*(a|d|c)\d+(,\d+)*$)</string>
+	<key>keyEquivalent</key>
+	<string>^~D</string>
 	<key>name</key>
 	<string>Diff</string>
 	<key>patterns</key>
@@ -47,13 +49,13 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>^((-{3} .+)|(\*{3} .+))$\n?</string>
+			<string>(^((-{3} .+)|(\*{3} .+))$\n?|^={4} .+(?= - ))</string>
 			<key>name</key>
 			<string>meta.diff.header.from-file</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>^\+{3} .+$\n?</string>
+			<string>(^\+{3} .+$\n?| - .* ={4}$\n?)</string>
 			<key>name</key>
 			<string>meta.diff.header.to-file</string>
 		</dict>