--- gentoo.lang.old	2008-03-26 10:24:31.000000000 +0100
+++ gentoo.lang	2008-03-26 10:48:16.000000000 +0100
@@ -6,7 +6,7 @@
 	Originally written for gtksourceview-1.x by:
 		Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2006.
 	Rewritten for gtksourceview-2 by:
-		Rene 'Necoro' Neumann <necoro@necoro.net>, 2007
+		Rene 'Necoro' Neumann <necoro@necoro.net>, 2007-2008
 	
 	Distributed under the same license(s) as gtksourceview.
 
@@ -32,50 +32,6 @@
 
 	<definitions>
 
-		<!-- rewrite shell string to show highlighted variables -->
-		<context id="string" style-ref="def:string">
-			<start>"</start>
-			<end>"</end>
-			<include>
-				<context ref="def:escape"/>
-				<context ref="def:line-continue"/>
-				<context ref="sh:variable"/>
-			</include>
-		</context>
-
-		<context id="string-2" style-ref="def:string">
-			<start>'</start>
-			<end>'</end>
-			<include>
-				<context ref="def:escape"/>
-				<context ref="def:line-continue"/>
-				<context ref="sh:variable"/>
-			</include>
-		</context>
-
-		<!-- subprograms:
-			- $(..) is not supported currently in the normal sh.lang
-			- `...` is interpreted as string - I think the subshell behavior is more acurate -->
-		<context id="subprogram">
-      		<start>\$\(</start>
-      		<end>\)</end>
-			<include>
-				<context sub-pattern="0" where="start" style-ref="sh:keyword"/>
-				<context sub-pattern="0" where="end" style-ref="sh:keyword"/>
-				<context ref="gentoo"/>
-			</include>
-		</context>
-
-		<context id="subprogram-2">
-			<start>`</start>
-      		<end>`</end>
-			<include>
-				<context sub-pattern="0" where="start" style-ref="sh:keyword"/>
-				<context sub-pattern="0" where="end" style-ref="sh:keyword"/>
-				<context ref="gentoo"/>
-			</include>
-		</context>
-
 		<!-- portage variables - currently unused -->
 		<context id="portvars" style-ref="variable">
 			<match>\b((ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)|(S|D|T|PV|PF|P|PN|A)|C(XX)?FLAGS|LDFLAGS|C(HOST|TARGET|BUILD))\b</match>
@@ -88,24 +44,24 @@
 
 		<!-- extra portage commands -->
 		<context id="portcmds" style-ref="command">
-			<match>\b(e(begin|end|conf|install|make|warn|infon?|error|patch)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|sed|dir|hard|sym|html|jar|mo)|keepdir|prepall(|docs|info|man|strip)|prep(info|lib|lib\.(so|a)|man|strip)|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</match>
+			<match>\b(e(begin|end|conf|install|make|log|warn|infon?|error|patch)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|sed|dir|hard|sym|html|jar|mo)|keepdir|prepall(|docs|info|man|strip)|prep(info|lib|lib\.(so|a)|man|strip)|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</match>
 		</context>
 		
 		<context id="built-in-command">
 			<include> <!-- do not include "sh:built-in-command" as it is replaced down there - which would lead to an endless loop -->
 				<context ref="sh:built-in-command-1" />
 				<context ref="sh:built-in-command-2" />
+				<context ref="sh:for-command" />
 				<context ref="portcmds" />
 			</include>
 		</context>
 
 		<!-- gentoo is just a shell with the replacements -->
 		<replace id="sh:built-in-command" ref="built-in-command" />
-		<replace id="sh:backtick-subshell" ref="subprogram-2" />
+
 		<context id="gentoo">
 			<include>
-				<context ref="subprogram"/>
-				<context ref="sh:sh"/>
+				<context ref="sh:sh" />
 			</include>
 		</context>
 	</definitions>