From 3ab3a7300c50504526030cb4e5bbdfd5e5e922a2 Mon Sep 17 00:00:00 2001
From: Mike Sperber <sperber@deinprogramm.de>
Date: Thu, 1 Nov 2007 09:31:59 +0000
Subject: [PATCH] Fix a problem with loading and saving files, specifically
 those with metadata:

If there is an error opening the file to be saved for write,
`on-save-file' is called, but `after-save-file' isn't.  As
`on-save-file' creates the metadata, and `after-save-file' zaps it
again, corruption results.  To fix, open the file inside the relevant
`dynamic-wind' rather than before.

The analogous problem existed with loading.

svn: r7602
---
 collects/mred/private/editor.ss | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/collects/mred/private/editor.ss b/collects/mred/private/editor.ss
index e56cebfb96..0812ed8710 100644
--- a/collects/mred/private/editor.ss
+++ b/collects/mred/private/editor.ss
@@ -148,11 +148,12 @@
 		     (begin
 		       (or (not load?)
 			   (on-load-file file (-format-filter format)))
-		       (let ([port (open-input-file file)]
+		       (let ([port #f]
 			     [finished? #f])
 			 (dynamic-wind
 			     void
 			     (lambda ()
+			       (set! port (open-input-file file))
 			       (wx:begin-busy-cursor)
 			       (super-begin-edit-sequence)
 			       (dynamic-wind
@@ -188,7 +189,7 @@
 			       #t)
 			     (lambda ()
 			       ;; In case it wasn't closed before:
-			       (close-input-port port)
+			       (if port (close-input-port port))
 			       (when load?
 				 (after-load-file finished?))))))))))])
 	    (public*
@@ -222,18 +223,19 @@
 						 (-get-file-format)
 						 f-format)]
 			      [text? (memq actual-format '(text text-force-cr))])
-			 (let ([port (open-output-file file (if text? 'text 'binary) 'truncate/replace)]
+			 (let ([port #f]
 			       [finished? #f])
 			   (dynamic-wind
 			       void
 			       (lambda ()
+				 (set! port (open-output-file file (if text? 'text 'binary) 'truncate/replace))
 				 (wx:file-creator-and-type file #"mReD" (if text? #"TEXT" #"WXME"))
 				 (wx:begin-busy-cursor)
 				 (dynamic-wind
 				     void
 				     (lambda ()
 				       (super-save-port port format #t)
-				       (close-output-port port) ; close as soon as possible
+				       (close-output-port port)	; close as soon as possible
 				       (unless (or (eq? format 'copy)
 						   (and (not (unbox temp-filename?-box))
 							(equal? file old-filename)))
@@ -248,7 +250,7 @@
 				 #t)
 			       (lambda ()
 				 ;; In case it wasn't closed before:
-				 (close-output-port port)
+				 (if port (close-output-port port))
 				 (after-save-file finished?))))))))))])
 
 	    (public*