--- a/Tools__CodeView2.st	Sat Nov 29 19:12:21 2014 +0100
+++ b/Tools__CodeView2.st	Mon Dec 01 13:47:51 2014 +0100
@@ -3565,14 +3565,8 @@
 
     "/JV@2011-12-20: HACK, the super implementation should
     "/not use leftIndent...when pasting. Following is a workaround"
-    | wasAutoIndent |
-
-    wasAutoIndent := autoIndent.
-    autoIndent := false.
-    [
+    self withAutoIndent:false do:[
         super insertLines:someText from:start to:end before:lineNr.
-    ] ensure:[
-        autoIndent := wasAutoIndent
     ]
 
     "Created: / 20-12-2011 / 15:32:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -4109,15 +4103,15 @@
 !CodeView2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.174 2014-11-27 15:45:28 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.175 2014-12-01 12:47:51 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.174 2014-11-27 15:45:28 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.175 2014-12-01 12:47:51 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__CodeView2.st,v 1.174 2014-11-27 15:45:28 vrany Exp $'
+    ^ '$Id: Tools__CodeView2.st,v 1.175 2014-12-01 12:47:51 cg Exp $'
 ! !