Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

• change use of meta.diff.separator to meta.separator

• make an explicit preference for the style of separators in the TextMate bundle (themes can still override this) and change the diff style (previously targeting meta.diff) to target only meta.diff.index


git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@3516 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
  • Loading branch information...
commit 478dff777b24435f1ddc962884537fe8684a6ba1 1 parent 955abb0
@sorbits sorbits authored
View
4 Preferences/Markup style: Diff metadata.plist
@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>name</key>
- <string>Style: Diff metadata</string>
+ <string>Style: Index</string>
<key>scope</key>
- <string>meta.diff</string>
+ <string>meta.diff.index</string>
<key>settings</key>
<dict>
<key>background</key>
View
2  Preferences/Markup style: Header.plist
@@ -10,6 +10,8 @@
<dict>
<key>background</key>
<string>#5685E3</string>
+ <key>foreground</key>
+ <string>#FFFFFF</string>
</dict>
<key>uuid</key>
<string>ED5636AE-09EF-46C4-A4F8-B88F701763E2</string>
View
6 Preferences/Markup style: Range.plist
@@ -8,8 +8,12 @@
<string>meta.diff.range</string>
<key>settings</key>
<dict>
+ <key>background</key>
+ <string>#3467D1</string>
<key>fontStyle</key>
- <string>plain</string>
+ <string>italic</string>
+ <key>foreground</key>
+ <string>#FFFFFF</string>
</dict>
<key>uuid</key>
<string>71A420A8-0892-4622-BDA4-CC00D98C59E6</string>
View
2  Syntaxes/Diff.plist
@@ -19,7 +19,7 @@
<key>match</key>
<string>^((\*{15})|(={67})|(-{3}))$\n?</string>
<key>name</key>
- <string>meta.diff.separator</string>
+ <string>meta.separator.diff</string>
</dict>
<dict>
<key>match</key>
View
4 info.plist
@@ -2,6 +2,10 @@
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
+ <key>deleted</key>
+ <array>
+ <string>DA3A550A-F4AF-4CFD-935F-8687FA17DC4B</string>
+ </array>
<key>mainMenu</key>
<dict>
<key>items</key>

0 comments on commit 478dff7

Please sign in to comment.
Something went wrong with that request. Please try again.