From 8cb42211606a33ccb4a6c37978352797284d02ce Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Fri, 19 Dec 2014 14:44:26 -0500
Subject: [PATCH 1/2] fix a couple merlin issues

---
 Preferences/Merlin Folding.tmPreferences |  2 +-
 Syntaxes/Merlin.tmLanguage               | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Preferences/Merlin Folding.tmPreferences b/Preferences/Merlin Folding.tmPreferences
index 108c73b..f188895 100644
--- a/Preferences/Merlin Folding.tmPreferences	
+++ b/Preferences/Merlin Folding.tmPreferences	
@@ -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>
diff --git a/Syntaxes/Merlin.tmLanguage b/Syntaxes/Merlin.tmLanguage
index ae8ae45..47cab55 100644
--- a/Syntaxes/Merlin.tmLanguage
+++ b/Syntaxes/Merlin.tmLanguage
@@ -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>

From de38244dc78a132b99f555ce57fbfcfd5573f9b7 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Sun, 11 Jan 2015 19:10:07 -0500
Subject: [PATCH 2/2] merlin - ; doesn't start a comment in a macro parameter

---
 Syntaxes/Merlin.tmLanguage | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Syntaxes/Merlin.tmLanguage b/Syntaxes/Merlin.tmLanguage
index 47cab55..7d08538 100644
--- a/Syntaxes/Merlin.tmLanguage
+++ b/Syntaxes/Merlin.tmLanguage
@@ -74,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>