Merge branch 'master' of github.com:ksherlock/65816.tmbundle

This commit is contained in:
Kelvin Sherlock 2016-02-12 14:00:35 -05:00
commit d1ece35946
2 changed files with 6 additions and 10 deletions

View File

@ -11,7 +11,7 @@
<key>foldingStartMarker</key>
<string>\b(?i:DUM|DO|IF|MAC|LUP)\b</string>
<key>foldingStopMarker</key>
<string>\b(?i:DEND|FIN)\b|&lt;&lt;&lt;|--\^</string>
<string>\b(?i:DEND|FIN|EOM)\b|&lt;&lt;&lt;|--\^</string>
</dict>
<key>uuid</key>
<string>9DDC3C1F-C4A9-4888-BFBA-1CFF7448AC47</string>

View File

@ -6,8 +6,6 @@
<array>
<string>S</string>
</array>
<key>isDisabled</key>
<false/>
<key>name</key>
<string>Merlin</string>
<key>patterns</key>
@ -63,10 +61,8 @@
<string>string.quoted.double</string>
</dict>
<dict>
<key>begin</key>
<string>'</string>
<key>end</key>
<string>'</string>
<key>match</key>
<string>'.*'</string>
<key>name</key>
<string>string.quoted.single</string>
</dict>
@ -78,13 +74,13 @@
</dict>
<dict>
<key>match</key>
<string>;.*</string>
<string>(?&lt;=[ \t])(;.*)</string>
<key>name</key>
<string>comment.line</string>
</dict>
<dict>
<key>match</key>
<string>^][0-~]*\b</string>
<string>][0-~]*\b</string>
<key>name</key>
<string>entity.name.label.variable</string>
</dict>
@ -361,7 +357,7 @@
</dict>
<dict>
<key>match</key>
<string>\b(?i:MAC)\b|&lt;&lt;&lt;</string>
<string>\b(?i:MAC|EOM)\b|&lt;&lt;&lt;</string>
<key>name</key>
<string>keyword.directive.macro</string>
</dict>