Merged improvements from Moss; started on fixing def highlighting

clojure.xml

@@ -41,7 +41,8 @@
 		<MARK_FOLLOWING AT_WORD_START="TRUE" TYPE="KEYWORD4">&amp;</MARK_FOLLOWING>
 
 		<MARK_FOLLOWING AT_WORD_START="TRUE" TYPE="LITERAL4">#^</MARK_FOLLOWING>
-
+
+		<SEQ TYPE="OPERATOR">^</SEQ>
 		<SEQ TYPE="OPERATOR">`</SEQ>
 		<SEQ TYPE="OPERATOR">@</SEQ>
 		<SEQ TYPE="OPERATOR">#</SEQ>
@@ -63,17 +64,16 @@
 			<END>"</END>
 		</SPAN>
 
+		<!-- TODO regular expressions -->
 		<SPAN TYPE="LITERAL1" ESCAPE="\">
 			<BEGIN>#"</BEGIN>
 			<END>"</END>
 		</SPAN>
 
-		<SPAN_REGEXP DELEGATE="FUNCTION" MATCH_TYPE="KEYWORD1" HASH_CHARS="def" NO_LINE_BREAK="TRUE">
-			<BEGIN>def\s+</BEGIN>
-			<END> </END>
-		</SPAN_REGEXP>
+		<EOL_SPAN_REGEXP DELEGATE="FUNCTION" MATCH_TYPE="KEYWORD1"
+		  AT_WORD_START="YES" HASH_CHARS="def">def\s+</EOL_SPAN_REGEXP>
 
-		<SPAN_REGEXP DELEGATE="FUNCTION" MATCH_TYPE="KEYWORD1" HASH_CHARS="def-" NO_LINE_BREAK="TRUE">
+		<SPAN_REGEXP DELEGATE="FUNCTION" MATCH_TYPE="KEYWORD2" HASH_CHARS="def-" NO_LINE_BREAK="TRUE">
 			<BEGIN>def-\s+</BEGIN>
 			<END> </END>
 		</SPAN_REGEXP>
@@ -422,7 +422,7 @@
 	</RULES>
 
 	<RULES SET="FUNCTION" IGNORE_CASE="FALSE" DEFAULT="FUNCTION">
-		<SEQ TYPE="OPERATOR">)</SEQ>
+		<EOL_SPAN_REGEXP DELEGATE="MAIN" MATCH_TYPE="OPERATOR">\s|\)</EOL_SPAN_REGEXP>
 	</RULES>
 </MODE>