--- a/AbstractFileBrowser.st	Thu Feb 24 11:18:48 2005 +0100
+++ b/AbstractFileBrowser.st	Thu Feb 24 11:55:23 2005 +0100
@@ -3984,8 +3984,7 @@
 !
 
 cvsAddAndCommitAsBinary:asBinary
-
-    |sel log cmd dir executionBlock nameString block|
+    |sel log cmd dir executionBlock nameString|
 
     log := Dialog
         requestText:(resources string:'Enter initial log message')
@@ -4001,20 +4000,16 @@
                     dir := self getDirWithoutFileName:fn.
 
                     cmd := ('cvs add -m ''' , log , ''' ' , fn baseName).
-                    block := self getExecutionBlockForCommand:cmd inDirectory:dir.
-                    block value:stream.
+                    (self getExecutionBlockForCommand:cmd inDirectory:dir) value:stream.
 
                     cmd := ('cvs commit -l -m ''' , log , ''' ' , fn baseName).
-                    block := self getExecutionBlockForCommand:cmd inDirectory:dir.
-                    block value:stream.
+                    (self getExecutionBlockForCommand:cmd inDirectory:dir) value:stream.
 
                     cmd := ('cvs admin -kb ' , fn baseName).
-                    block := self getExecutionBlockForCommand:cmd inDirectory:dir.
-                    block value:stream.
+                    (self getExecutionBlockForCommand:cmd inDirectory:dir) value:stream.
 
                     cmd := ('cvs upd ' , fn baseName).
-                    block := self getExecutionBlockForCommand:cmd inDirectory:dir.
-                    block value:stream.
+                    (self getExecutionBlockForCommand:cmd inDirectory:dir) value:stream.
                 ]
             ] 
         ]
@@ -4028,7 +4023,6 @@
 !
 
 cvsCommit
-
     |nSel log msg cmd selectedFiles sel executionBlock nameString|
 
     selectedFiles:= self currentSelectedFiles.
@@ -4057,11 +4051,10 @@
         log notNil ifTrue:[
             sel size > 0 ifTrue:[
                 sel do:[:fn |
-                    | dir block |
+                    | dir |
                     dir := fn directory.
                     cmd := ('cvs commit -m ''' , log , ''' ' , fn baseName).
-                    block := self getExecutionBlockForCommand:cmd inDirectory:dir.
-                    block value:stream.
+                    (self getExecutionBlockForCommand:cmd inDirectory:dir) value:stream.
                 ]
             ] 
         ]
@@ -4080,7 +4073,6 @@
     toRemove := OrderedCollection new.
 
     executionBlock := [ : stream |
-        | block |
         filesToRemove do:[:fileName |
             OperatingSystem accessDeniedErrorSignal handle:[:ex|
                 "was not able to remove it"
@@ -4097,15 +4089,16 @@
                 (fileName isSymbolicLink not) ifTrue:[
                     fileName remove.
                     cmd := ('cvs remove -f ' , fileName baseName).
-                    block := self getExecutionBlockForCommand:cmd.
-                    block value:stream.
+                    (self getExecutionBlockForCommand:cmd) value:stream.
                 ]
             ].
         ].
-
-        cmd := ('cvs commit -m ''removed via FileBrowser''').
-        block := self getExecutionBlockForCommand:cmd. 
-        block value:stream.
+        OperatingSystem isMSWINDOWSlike ifTrue:[
+            cmd := 'cvs commit -l -m "removed via FileBrowser"'.
+        ] ifFalse:[
+            cmd := 'cvs commit -l -m ''removed via FileBrowser'''.
+        ].
+        (self getExecutionBlockForCommand:cmd) value:stream.
     ].
     nameString := 'Command> cvs remove and commit ', filesToRemove first baseName.
     filesToRemove size > 1 ifTrue:[
@@ -4115,7 +4108,6 @@
 !
 
 cvsRemoveFileAndCVSContainer
-
     |sel question aswer|
 
     sel := self currentSelectedFiles copy.
@@ -4139,7 +4131,6 @@
 !
 
 cvsUpdateAll
-
     | cmd |
 
     cmd := 'cvs upd -l'.
@@ -4147,7 +4138,6 @@
 !
 
 cvsUpdateAllRecursive
-
     | cmd |
 
     cmd := 'cvs upd -d'.
@@ -4155,10 +4145,8 @@
 !
 
 cvsUpdateSelection
-
     | selectedFiles stream|
 
-
     selectedFiles:= self currentSelectedFiles.
     stream := WriteStream on:''.
     stream nextPutAll:'cvs upd '.
@@ -6600,5 +6588,5 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.279 2005-02-16 12:32:14 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.280 2005-02-24 10:55:23 cg Exp $'
 ! !