--- a/TerminalView.st	Mon Sep 16 14:58:14 2002 +0200
+++ b/TerminalView.st	Tue Sep 17 11:07:29 2002 +0200
@@ -1551,32 +1551,32 @@
 "/^ self.
 
     access critical:[
-        |i i2 s crnlFollows|
+        |index controlCharIndex stringWithOutControl crnlFollows|
 
-        i := 1.
-        [i <= count] whileTrue:[
+        index := 1.
+        [index <= count] whileTrue:[
             (state == 0) ifTrue:[
                 "/ in initial state.
                 "/ quick scan forward for next control character ...
-                i2 := buffer indexOfControlCharacterStartingAt:i.
-                i2 > count ifTrue:[i2 := 0].
+                controlCharIndex := buffer indexOfControlCharacterStartingAt:index.
+                controlCharIndex > count ifTrue:[controlCharIndex := 0].
 
-                i2 == 0 ifTrue:[
+                controlCharIndex == 0 ifTrue:[
                     "/ no control characters - simply append all
                     "/ to the outstanding lines ...
-                    s := buffer copyFrom:i to:count.
-                    i := count + 1. "/ leave loop.
+                    stringWithOutControl := buffer copyFrom:index to:count.
+                    index := count + 1. "/ leave loop.
                     crnlFollows := false.
                 ] ifFalse:[
-                    i2 > i ifTrue:[
-                        s := buffer copyFrom:i to:i2-1.
-                        i := i2. "/ proceed withcontrol character
+                    controlCharIndex > index ifTrue:[
+                        stringWithOutControl := buffer copyFrom:index to:controlCharIndex-1.
+                        index := controlCharIndex. "/ proceed withcontrol character
                         crnlFollows := false.
-                        i < (count - 1) ifTrue:[
-                            (buffer at:i) == Character return ifTrue:[
-                                (buffer at:i+1) == Character nl ifTrue:[
+                        index < (count - 1) ifTrue:[
+                            (buffer at:index) == Character return ifTrue:[
+                                (buffer at:index+1) == Character nl ifTrue:[
                                     crnlFollows := true.
-                                    i := i + 2.
+                                    index := index + 2.
                                 ]
                             ]
                         ].
@@ -1584,15 +1584,15 @@
                 ].
             ].
 
-            s notNil ifTrue:[
+            stringWithOutControl notNil ifTrue:[
                 currentEmphasis notNil ifTrue:[
-                    s := s emphasizeAllWith:currentEmphasis
+                    stringWithOutControl := stringWithOutControl emphasizeAllWith:currentEmphasis
                 ].
 
                 outstandingLine size > 0 ifTrue:[
-                    outstandingLine := outstandingLine , s.
+                    outstandingLine := outstandingLine , stringWithOutControl.
                 ] ifFalse:[
-                    outstandingLine := s.
+                    outstandingLine := stringWithOutControl.
                 ].
                 crnlFollows ifTrue:[
                     outstandingLines isNil ifTrue:[
@@ -1602,7 +1602,7 @@
                     ].
                     outstandingLine := ''.
                 ].
-                s := nil.
+                stringWithOutControl := nil.
 
                 collecting ifTrue:[
                     flushPending ifFalse:[
@@ -1620,11 +1620,11 @@
                 "/ must handle individual characters
                 "/ to update the state machine.
 
-                self nextPut:(buffer at:i).
-                i := i + 1.
-                [state ~~ 0 and:[i <= count]] whileTrue:[
-                    self nextPut:(buffer at:i).
-                    i := i + 1.
+                self nextPut:(buffer at:index).
+                index := index + 1.
+                [state ~~ 0 and:[index <= count]] whileTrue:[
+                    self nextPut:(buffer at:index).
+                    index := index + 1.
                 ]
             ]
         ].
@@ -1778,5 +1778,5 @@
 !TerminalView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/TerminalView.st,v 1.98 2002-09-05 12:41:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/TerminalView.st,v 1.99 2002-09-17 09:07:29 penk Exp $'
 ! !