From: Taylor R Campbell <campbell@mumble.net>
Date: Tue, 14 Jul 2009 20:50:35 +0000 (-0400)
Subject: Don't call SAVE-RESOURCE in DISCARD-FOLDER-CACHE on file folders.
X-Git-Tag: 20100708-Gtk~370^2
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=f99cb2cd384a40f51e73d8e771bc1afd601eb59c;p=mit-scheme.git

Don't call SAVE-RESOURCE in DISCARD-FOLDER-CACHE on file folders.
DISCARD-FOLDER-CACHE is called only when we want to discard changes.
---

diff --git a/src/imail/imail-file.scm b/src/imail/imail-file.scm
index 55fbb7740..3fcdecaae 100644
--- a/src/imail/imail-file.scm
+++ b/src/imail/imail-file.scm
@@ -277,8 +277,7 @@ USA.
 (define-method close-resource ((folder <file-folder>) no-defer?)
   no-defer?
   (save-resource folder)
-  (discard-file-folder-messages folder)
-  (discard-file-folder-xstring folder))
+  (discard-folder-cache folder))
 
 (define (discard-file-folder-messages folder)
   (without-interrupts
@@ -452,7 +451,8 @@ USA.
       (call-with-input-xstring (file-folder-xstring folder) 0 reader)))))
 
 (define-method discard-folder-cache ((folder <file-folder>))
-  (close-resource folder #f))
+  (discard-file-folder-messages folder)
+  (discard-file-folder-xstring folder))
 
 (define-method probe-folder ((folder <file-folder>))
   folder