Merge jv
authorMerge Script
Tue, 20 Sep 2016 07:02:47 +0200
branchjv
changeset 3980 dbd096a81e74
parent 3979 2189213f4f4e (current diff)
parent 3977 39fe23d7db13 (diff)
child 3983 47ba0678c862
Merge
AbstractSyntaxHighlighter.st
--- a/AbstractSyntaxHighlighter.st	Tue Sep 20 00:02:47 2016 +0100
+++ b/AbstractSyntaxHighlighter.st	Tue Sep 20 07:02:47 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2006 by eXept Software AG
 	      All Rights Reserved
@@ -346,45 +348,46 @@
      languages. These are optionally shown with another color (blue)"
 
     ^ #(
-	ifTrue: ifFalse:
-	ifTrue:ifFalse: ifFalse:ifTrue:
-	ifNil: ifNotNil:
-	ifNil:ifNotNil: ifNotNil:ifNil:
-	and: or:
+        ifTrue: ifFalse:
+        ifTrue:ifFalse: ifFalse:ifTrue:
+        ifNil: ifNotNil:
+        ifNil:ifNotNil: ifNotNil:ifNil:
+        and: or:
 
-	whileTrue:
-	whileFalse:
+        whileTrue:
+        whileFalse:
 
-	to:do:
-	downTo:do:
-	to:by:do:
+        to:do:
+        downTo:do:
+        to:by:do:
 
-	loop
-	whileTrue
-	whileFalse
-	doWhile:
-	doUntil:
+        loop
+        repeat
+        whileTrue
+        whileFalse
+        doWhile:
+        doUntil:
 
-	do:
-	doWithIndex:
-	pairWiseDo:
-	keysAndValuesDo:
+        do:
+        doWithIndex:
+        pairWiseDo:
+        keysAndValuesDo:
 
-	withPriority:do:
-	handle:do:
-	on:do:
-	catch:
-	ignoreIn:
+        withPriority:do:
+        handle:do:
+        on:do:
+        catch:
+        ignoreIn:
 
-	"/ newProcess
-	fork:
-	ensure:
-	ifCurtailed:
-	valueOnUnwindDo:
-	valueNowOrOnUnwindDo:
+        "/ newProcess
+        fork:
+        ensure:
+        ifCurtailed:
+        valueOnUnwindDo:
+        valueNowOrOnUnwindDo:
 
-	caseOf:
-	caseOf:otherwise:
+        caseOf:
+        caseOf:otherwise:
     )
 
     "Created: / 08-09-2006 / 15:56:47 / cg"