--- a/CodeView.st	Wed May 29 13:14:02 2013 +0200
+++ b/CodeView.st	Wed May 29 19:15:20 2013 +0200
@@ -78,7 +78,7 @@
 !CodeView class methodsFor:'others'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/CodeView.st,v 1.63 2013-04-30 18:21:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/CodeView.st,v 1.64 2013-05-29 17:15:20 cg Exp $'
 ! !
 
 !CodeView methodsFor:'accessing'!
@@ -114,17 +114,21 @@
     |wasOn line newCol |
 
     "/ make Jan's enhancement dependent on
-    "/ the st80EditMode-flag setting - to avoid confusing
+    "/ the autoIndent-flag setting - to avoid confusing
     "/ those who are used to the old behavior.
     "/ for Jan: 
-    "/     st80EditMode is configured in the settings-Editor dialog
+    "/     autoIndent is configured in the settings-Editor dialog (for all new editors)
+    "/     or in the per-editor popup menu (misc)
+    "/ 
     "/ and saved/restored with the userPreferences.
 
-    (self st80EditMode not
-    or:[cursorLine == 1]) ifTrue:[
+    (autoIndent "self st80EditMode" not
+    or:[ cursorLine == 1
+    or:[ self sensor shiftDown]]) ifTrue:[
         super cursorReturn.
         ^ self.
     ].
+
     wasOn := self hideCursor .
     line := self listAt:cursorLine.
     newCol := line size == 0
@@ -133,7 +137,6 @@
     super cursorReturn.
     line := self listAt:cursorLine.
 
-
     newCol := line size == 0
                     ifTrue:[newCol]
                     ifFalse:[line indexOfNonSeparator].
@@ -326,6 +329,6 @@
 !CodeView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/CodeView.st,v 1.63 2013-04-30 18:21:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/CodeView.st,v 1.64 2013-05-29 17:15:20 cg Exp $'
 ! !