From 18cc060584e71ca5e9f15b097df5fab8c1bc5414 Mon Sep 17 00:00:00 2001
From: Jonas Rosling <jonas.rosling@esl>
Date: Wed, 4 Jul 2012 09:02:37 +0200
Subject: [PATCH 1/4] added a comment and changed name of String_mod to
 String_format

---
 erlang.jsf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/erlang.jsf b/erlang.jsf
index 99f338e..8b4c7b6 100644
--- a/erlang.jsf
+++ b/erlang.jsf
@@ -3,7 +3,7 @@
 =Idle
 =Comment	fg_030
 =String		fg_110
-=String_mod	fg_200 bold
+=String_format	fg_200 bold
 =String_esc	fg_000 bold
 =Int		fg_033
 =Record		fg_530
@@ -47,7 +47,7 @@
 	*		idle		noeat
 	"a-zA-Z_"	recatt
 
-# STRINGS
+# STRINGS (not complete)
 :string String
 	*		string
 	"\\"		string_escape	recolor=-1
@@ -72,9 +72,9 @@
 
 :string_mod String
 	*		string
-	"cfegswpWPBX#bx+ni"	string_modifier recolormark noeat
+	"cfegswpWPBX#bx+ni"	string_format recolormark noeat
 
-:string_modifier String_mod
+:string_format String_format
 	*		string
 # END STRINGS
 :decimal Int

From f9a81e3be926814a2c8d8440063f0b4cbe5f9423 Mon Sep 17 00:00:00 2001
From: Jonas Rosling <jonas.rosling@esl>
Date: Wed, 4 Jul 2012 09:11:12 +0200
Subject: [PATCH 2/4] hot fix to strings

---
 erlang.jsf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erlang.jsf b/erlang.jsf
index 8b4c7b6..2d588bf 100644
--- a/erlang.jsf
+++ b/erlang.jsf
@@ -4,7 +4,7 @@
 =Comment	fg_030
 =String		fg_110
 =String_format	fg_200 bold
-=String_esc	fg_000 bold
+=String_esc	fg_110 bold
 =Int		fg_033
 =Record		fg_530
 =Recatt		fg_530
@@ -71,7 +71,7 @@
 	"0-9*"		string_p
 
 :string_mod String
-	*		string
+	*		string		noeat
 	"cfegswpWPBX#bx+ni"	string_format recolormark noeat
 
 :string_format String_format

From 79ecabc24325cb646523dd4631ba2598095678a6 Mon Sep 17 00:00:00 2001
From: Jonas Rosling <jonas.rosling@esl>
Date: Mon, 9 Jul 2012 09:49:38 +0200
Subject: [PATCH 3/4] beautification and consistency fix

---
 erlang.jsf | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/erlang.jsf b/erlang.jsf
index 2d588bf..7b9bd86 100644
--- a/erlang.jsf
+++ b/erlang.jsf
@@ -3,8 +3,8 @@
 =Idle
 =Comment	fg_030
 =String		fg_110
-=String_format	fg_200 bold
-=String_esc	fg_110 bold
+=String_mod	fg_200 bold
+=String_esc	fg_000 bold
 =Int		fg_033
 =Record		fg_530
 =Recatt		fg_530
@@ -47,7 +47,7 @@
 	*		idle		noeat
 	"a-zA-Z_"	recatt
 
-# STRINGS (not complete)
+# STRINGS
 :string String
 	*		string
 	"\\"		string_escape	recolor=-1
@@ -71,10 +71,10 @@
 	"0-9*"		string_p
 
 :string_mod String
-	*		string		noeat
-	"cfegswpWPBX#bx+ni"	string_format recolormark noeat
+	*		string
+	"cfegswpWPBX#bx+ni"	string_modifier recolormark noeat
 
-:string_format String_format
+:string_modifier String_mod
 	*		string
 # END STRINGS
 :decimal Int
@@ -101,7 +101,7 @@
 	*		idle		noeat
 
 :atom Idle
-	*		idle		noeat strings
+	*		no_atom		noeat strings
 	"after"		kw
 	"and"		kw
 	"andalso"	kw
@@ -131,9 +131,13 @@
 	"when"		kw
 	"xor"		kw
 done 
+	"a-zA-Z0-9_@"	atom
+
+:no_atom Idle
+	*		idle		noeat
+	" "		no_atom
 	"("		function	recolormark noeat
 	":"		module		recolormark noeat
-	"a-zA-Z0-9_@"	atom
 
 :module Module
 	*		idle		noeat

From 34dab5175df7bb2d93f371054822bcedfbce07dc Mon Sep 17 00:00:00 2001
From: Jonas Rosling <jonas.rosling@esl>
Date: Mon, 9 Jul 2012 09:58:39 +0200
Subject: [PATCH 4/4] blooper

---
 erlang.jsf | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/erlang.jsf b/erlang.jsf
index e5ab9ba..7b9bd86 100644
--- a/erlang.jsf
+++ b/erlang.jsf
@@ -142,11 +142,6 @@ done
 :module Module
 	*		idle		noeat
 
-:maybe_function Idle
-	*		idle		noeat
-	" "		maybe_function
-	"("		function	recolormark noeat
-
 :function Fun
 	*		idle		noeat