--- a/CodeView.st	Fri Oct 18 17:01:49 2013 +0200
+++ b/CodeView.st	Fri Oct 18 23:12:49 2013 +0200
@@ -78,7 +78,7 @@
 !CodeView class methodsFor:'others'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/CodeView.st,v 1.64 2013-05-29 17:15:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/CodeView.st,v 1.65 2013-10-18 21:12:49 cg Exp $'
 ! !
 
 !CodeView methodsFor:'accessing'!
@@ -128,18 +128,23 @@
         super cursorReturn.
         ^ self.
     ].
+    "/ autoIndent
 
-    wasOn := self hideCursor .
-    line := self listAt:cursorLine.
-    newCol := line size == 0
-                    ifTrue:[1]
-                    ifFalse:[line indexOfNonSeparator].
+    wasOn := self hideCursor.
+"/
+"/    line := self listAt:cursorLine.
+"/    newCol := line size == 0
+"/                    ifTrue:[1]
+"/                    ifFalse:[line indexOfNonSeparator].
+"/    super cursorReturn.
+"/    line := self listAt:cursorLine.
+"/
+"/    newCol := line size == 0
+"/                    ifTrue:[newCol]
+"/                    ifFalse:[line indexOfNonSeparator].
+
     super cursorReturn.
-    line := self listAt:cursorLine.
-
-    newCol := line size == 0
-                    ifTrue:[newCol]
-                    ifFalse:[line indexOfNonSeparator].
+    newCol := (self leftIndentForLine:cursorLine)+1.
 
     self setCursorCol:newCol.
     self makeCursorVisibleAndShowCursor:wasOn
@@ -329,6 +334,6 @@
 !CodeView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/CodeView.st,v 1.64 2013-05-29 17:15:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/CodeView.st,v 1.65 2013-10-18 21:12:49 cg Exp $'
 ! !