[rkward] rkward/syntax: merging back changes from kate

[m.eik michalke]

Git commit 7801fec68aebf851c19d6c4982161d35703fcf25 by m.eik michalke.
Committed on 29/08/2018 at 21:50.
Pushed by meikm into branch 'master'.

merging back changes from kate

M  +3    -3    rkward/syntax/r.xml

https://commits.kde.org/rkward/7801fec68aebf851c19d6c4982161d35703fcf25

diff --git a/rkward/syntax/r.xml b/rkward/syntax/r.xml
index cfc8b29d..144418a0 100644
--- a/rkward/syntax/r.xml
+++ b/rkward/syntax/r.xml
@@ -79,7 +79,7 @@
 
 		<context attribute="Normal Text" lineEndContext="#stay" name="operator_rhs" fallthrough="true" fallthroughContext="#pop">
 			<!-- While there is nothing of interest, stay in the context -->
-			<StringDetect attribute="Headline" context="Headline" String="##"/>
+			<Detect2Chars attribute="Headline" context="Headline" char="#" char1="#"/>
 			<DetectChar attribute="Comment" context="Comment" char="#"/>
 			<DetectChar attribute="String" context="#stay" char=" "/>
 			<!-- Operators other than +, -, and ! directly after another operator are an error. -->
@@ -104,8 +104,8 @@
 			<Int attribute="Int" context="#stay"/>
 			<RegExpr attribute="Keyword" context="#stay" String="[a-zA-Z_]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
 			<RegExpr attribute="Keyword" context="#stay" String="\.[a-zA-Z_\.]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
-			<RegExpr attribute="Symbol" context="parenthesis" String="\("/>
-			<StringDetect attribute="Headline" context="Headline" String="##"/>
+			<DetectChar attribute="Symbol" context="parenthesis" char="("/>
+			<Detect2Chars attribute="Headline" context="Headline" char="#" char1="#"/>
 			<DetectChar attribute="Comment" context="Comment" char="#"/>
 
 			<!-- For (assignment) operators, enter a new context operator_rhs to check what follows (generally, that should not be another op) -->