--- a/Tools__CodeView2.st	Tue Jul 09 22:52:27 2013 +0100
+++ b/Tools__CodeView2.st	Mon Jul 15 13:16:46 2013 +0100
@@ -43,7 +43,8 @@
 SimpleView subclass:#GutterView
 	instanceVariableNames:'codeView textView textViewScroller widthAcceptCancel
 		widthAnnotations widthDiffInfo firstLineShown lastLineShown
-		numberOfLines acceptColor cancelColor diffColor currentBlockNodeHolder menuHolder'
+		numberOfLines acceptColor cancelColor diffColor
+		currentBlockNodeHolder menuHolder'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:CodeView2
@@ -1412,11 +1413,7 @@
 
     "Created: / 06-07-2011 / 17:12:58 / jv"
     "Modified: / 06-10-2011 / 14:13:44 / cg"
-!
-
-
-
- !
+! !
 
 !CodeView2 methodsFor:'diff mode'!
 
@@ -2420,8 +2417,6 @@
     "Created: / 14-12-2009 / 13:37:47 / Jindra <a>"
 !
 
-
-
 lineColorForLine:line
     "return special color for given line if required, nil otherwise"
     "used only if lineFont returns nil"
@@ -2438,8 +2433,6 @@
     "Created: / 14-12-2009 / 13:38:23 / Jindra <a>"
 !
 
-
-
 lineFontForLine:line
     "return special font for given line if required, nil otherwise"
 
@@ -2969,8 +2962,6 @@
     "Modified: / 17-03-2012 / 10:04:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-
-
 redrawLines
     |i pom|
 
@@ -3366,13 +3357,14 @@
     diffMode := false.
     suppressNotifications := false.
     reallyModifiedChannel := false asValue.
+    autoIndent := UserPreferences current codeView2AutoIndent.
 
     self enableMotionEvents.
 
     "Created: / 23-06-2010 / 17:28:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 06-07-2011 / 17:46:31 / jv"
     "Modified: / 21-08-2011 / 10:09:29 / cg"
-    "Modified: / 07-10-2011 / 19:22:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-07-2013 / 13:15:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 setCodeView: aCodeView2
@@ -3641,8 +3633,6 @@
 
 !CodeView2::TextView methodsFor:'scrolling'!
 
-
-
 basicScrollTo:anOrigin redraw:doRedraw
     super scrollTo:anOrigin redraw:doRedraw
 
@@ -3651,8 +3641,6 @@
     "Created: / 19-03-2012 / 17:01:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-
-
 originChanged:delta
 
     super originChanged:delta.
@@ -3662,8 +3650,6 @@
     "Created: / 07-12-2009 / 21:50:49 / Jindra <a>"
 !
 
-
-
 scrollTo:anOrigin redraw:doRedraw
 
     codeView scrollTo:anOrigin redraw:doRedraw in: self.
@@ -3672,9 +3658,7 @@
     "Modified: / 06-04-2010 / 14:04:28 / Jakub <zelenja7@fel.cvut.cz>"
     "Modified: / 17-03-2012 / 10:06:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 19-03-2012 / 17:05:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
- !
+! !
 
 !CodeView2::TextView methodsFor:'undo & again'!