# HG changeset patch
# User Jan Vrany <jan.vrany@fit.cvut.cz>
# Date 1465457756 -3600
# Node ID 3f4eb92d9db1491645bbba5f6107e3029a06292c
# Parent  72291f0844d788036dceef6dc2691fc975e87891# Parent  083ee2b67357286de8bafa960fcc91ad4c585d05
Merge

diff -r 72291f0844d7 -r 3f4eb92d9db1 .hgtags
--- a/.hgtags	Tue Jun 07 06:40:28 2016 +0200
+++ b/.hgtags	Thu Jun 09 08:35:56 2016 +0100
@@ -11,6 +11,7 @@
 1cd1ea860d26ac7ca936e6f3252a2039f50f72d3 expecco_2_7_5a
 1fe161a855da4488136b2afef189770aee4f6a66 expecco_2_9_0
 1fe161a855da4488136b2afef189770aee4f6a66 expecco_2_9_0_a
+1fe161a855da4488136b2afef189770aee4f6a66 expecco_2_9_0_win75_lx36
 2d10ecc7efb00e010206a0f1e435845c12d46c5d expecco_2_1_0
 2d77124d5a285289f8095486377ae22f7deb9870 expecco_2_6_0rc1
 2df69a526f068f2603fe4edb7ad6300fb9080c65 stable_expecco_sel
diff -r 72291f0844d7 -r 3f4eb92d9db1 TextView.st
--- a/TextView.st	Tue Jun 07 06:40:28 2016 +0200
+++ b/TextView.st	Thu Jun 09 08:35:56 2016 +0100
@@ -2587,6 +2587,11 @@
 		doAppend ifTrue:[
 		    aStream := filename appendingWriteStream.
 		] ifFalse:[
+                    UserPreferences current generateBackupFileWhenSaving ifTrue:[
+                        filename exists ifTrue:[
+                            filename moveTo:(filename pathName,'.bak') asFilename
+                        ].    
+                    ].    
 		    aStream := filename newReadWriteStream.
 		].
                 aStream eolMode:eolMode.