fixed some merge errors

erlang.jsf

@@ -142,6 +142,11 @@ done
 :module Module
 	*		idle		noeat
 
+:maybe_function Idle
+	*		idle		noeat
+	" "		maybe_function
+	"("		function	recolormark noeat
+
 :function Fun
 	*		idle		noeat
 

ftyperc

@@ -926,3 +926,20 @@
 *.sieve
 -syntax sieve
 -autoindent
+
+ Puppet
+*.pp
+-syntax puppet
+-pound_comment
+-autoindent
+
+ ip(6)tables
+*
++# Generated by iptables-save
+-syntax iptables
+-pound_comment
+
+*
++# Generated by ip6tables-save
+-syntax iptables
+-pound_comment

iptables.jsf

@@ -0,0 +1,116 @@
+# JOE syntax highlight file for ip(6)tables-save and -restore
+
+=Idle
+=Comment	green
+=Constant	cyan
+=Escape		bold cyan
+=Bad		bold red
+
+=Table		bold
+=Policy		bold blue
+=Option		fg_310 # brown
+
+:line_start Idle
+	*		rest		noeat
+	"#"		line_comment	recolor=-1
+	"*"		maybe_table	buffer
+	":"		default_policy	recolor=-1
+	"C"		maybe_commit	buffer
+	"-"		command
+
+:rest Idle
+	*		rest
+	"\n"		line_start
+
+:line_comment Comment
+	*		line_comment
+	"\n"		line_start
+
+:maybe_table Idle
+	*		bad		noeat strings
+	"*filter"	table_name
+	"*mangle"	table_name
+	"*nat"		table_name
+	"*raw"		table_name
+done
+	"a-z"		maybe_table
+
+:table_name Table
+	*		bad		noeat
+	"\n"		line_start
+
+:default_policy Policy
+	*		default_policy
+	"\n"		line_start
+
+:maybe_commit Idle
+	*		bad		noeat strings
+	"COMMIT"	commit
+done
+	"A-Z"		maybe_commit
+
+:commit Table
+	*		bad		noeat
+	"\n"		line_start
+
+:command Idle
+	*		bad		noeat
+	"ADINX"		chain_name_pre
+
+:chain_name_pre Idle
+	*		chain_name	noeat
+	" "		chain_name_pre
+
+:chain_name Option
+	*		chain_name
+	" "		rule_spec
+
+:rule_spec Idle
+	*		rule_option	noeat
+	" "		rule_spec
+	"\n"		line_start
+
+:rule_option Idle
+	*		rule_option
+	" "		rule_spec
+	"\n"		line_start
+	"-"		rule_flag
+
+:rule_flag Idle
+	*		rule_option
+	"-"		rule_flag_flag
+	"iojp"		rule_iojp_pre
+	"sd"		rule_sd_pre
+
+:rule_flag_flag Idle
+	*		rule_flag_flag1	buffer
+
+:rule_flag_flag1 Idle
+	*		rule_option	noeat strings
+	"sport"		rule_sd_pre
+	"dport"		rule_sd_pre
+done
+	"a-z-_"		rule_flag_flag1
+	
+
+:rule_iojp_pre Idle
+	*		rule_iojp	noeat
+	" "		rule_iojp_pre
+
+:rule_iojp Option
+	*		rule_iojp
+	" "		rule_option
+	"\n"		line_start
+
+:rule_sd_pre Idle
+	*		rule_sd		noeat
+	" "		rule_sd_pre
+
+:rule_sd Constant
+	*		rule_sd
+	" "		rule_option
+	"\n"		line_start
+
+:bad Bad
+	*		bad
+	"\n"		line_start

puppet.jsf

@@ -0,0 +1,114 @@
+# JOE syntax highlight file for Puppet
+
+=Idle
+=Comment	green
+=CommentLabel	bold green
+=Constant	cyan
+=Escape		bold cyan
+=Type		bold
+=Keyword	bold
+=Bad		bold red
+=Var		fg_310 # brown
+=Brace		magenta
+
+=KeywordAttr	bold
+
+:idle Idle
+	*		idle
+	"\n"		idle
+	"#"		comment		recolor=-1
+	"{[]}"		brace		recolor=-1
+	"0"		first_digit	recolor=-1
+	"1-9"		decimal		recolor=-1
+	"\""		string		recolor=-1
+	"'"		char		recolor=-1
+	"/"		regex		recolor=-1
+	"$"		variable	recolor=-1
+	"A-Z"		type		recolor=-1
+	"a-z"		ident		buffer
+	
+:comment Comment
+	*		comment
+	"\n"		idle
+
+:brace Brace
+	*		idle		noeat
+
+:first_digit Constant
+	*		idle		noeat
+	"0-7"		octal
+	"89"		bad_number	recolor=-1
+
+:bad_number Bad
+	*		idle		noeat
+	"0-9"		bad_number
+
+:octal Constant
+	*		idle		noeat
+	"0-7_"		octal
+	"89"		bad_number	recolor=-1
+
+:decimal Constant
+	*		idle		noeat
+	"0-9_"		decimal
+
+:char Constant
+	*		char
+	"'"		idle
+
+:string Constant
+	*		string
+	"\""		idle
+	"$"		maybe_string_subst	recolor=-1
+
+:maybe_string_subst Constant
+	*		string		noeat
+	"{"		string_subst	recolor=-2
+
+:string_subst Escape
+	*		string_subst
+	"}"		string
+
+:regex Constant
+	*		regex
+	"\\"		regex_quote	recolor=-1
+	"/"		idle
+
+:regex_quote Escape
+	*		regex
+
+:variable Var
+	*		idle		noeat
+	"a-zA-Z0-9_:"	variable
+
+:type Type
+	*		idle		noeat
+	"a-zA-Z0-9_"	type
+
+:ident Idle
+	*		idle		noeat strings
+	"case"		kw
+	"class"		kw
+	"else"		kw
+	"elsif"		kw
+	"false"		kw
+	"if"		kw
+	"true"		kw
+	"undef"		kw
+	# prominent attrs
+	"ensure"	kw_attr
+	# methods
+	"fail"		method
+	"notice"	method
+	"template"	method
+done
+	"a-zA-Z0-9_"	ident
+
+:kw Keyword
+	*		idle		noeat
+
+:kw_attr KeywordAttr
+	*		idle		noeat
+
+:method Keyword
+	*		idle		noeat