6502
/
65816.tmbundle
mirror of https://github.com/ksherlock/65816.tmbundle.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix a couple merlin issues

This commit is contained in:
Kelvin Sherlock 2014-12-19 14:44:26 -05:00
parent 73bc944d20
commit 8cb4221160
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Preferences/Merlin Folding.tmPreferences
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>

10
Syntaxes/Merlin.tmLanguage
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>
@ -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>