From a1ec53f946ed7f125e3ec25e4edac5e3b8183453 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Mon, 22 May 2000 19:49:57 +0000
Subject: [PATCH] Always run SAVE-FOLDER as part of CLOSE-FOLDER.

---
 v7/src/imail/imail-core.scm | 8 ++++++--
 v7/src/imail/imail-file.scm | 4 ++--
 v7/src/imail/imail-imap.scm | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/v7/src/imail/imail-core.scm b/v7/src/imail/imail-core.scm
index c725bb219..363fca89f 100644
--- a/v7/src/imail/imail-core.scm
+++ b/v7/src/imail/imail-core.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-core.scm,v 1.84 2000/05/22 19:44:44 cph Exp $
+;;; $Id: imail-core.scm,v 1.85 2000/05/22 19:49:50 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -311,7 +311,11 @@
 ;; of the folder must work, but may incur a significant time or space
 ;; penalty.
 
-(define-generic close-folder (folder))
+(define (close-folder folder)
+  (save-folder folder)
+  (%close-folder folder))
+
+(define-generic %close-folder (folder))
 
 ;; -------------------------------------------------------------------
 ;; Return the number of messages in FOLDER.
diff --git a/v7/src/imail/imail-file.scm b/v7/src/imail/imail-file.scm
index f976f6131..729d10086 100644
--- a/v7/src/imail/imail-file.scm
+++ b/v7/src/imail/imail-file.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-file.scm,v 1.34 2000/05/22 03:44:22 cph Exp $
+;;; $Id: imail-file.scm,v 1.35 2000/05/22 19:49:55 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -102,7 +102,7 @@
 (define (file-folder-pathname folder)
   (file-url-pathname (folder-url folder)))
 
-(define-method close-folder ((folder <file-folder>))
+(define-method %close-folder ((folder <file-folder>))
   (without-interrupts
    (lambda ()
      (let ((messages (%file-folder-messages folder)))
diff --git a/v7/src/imail/imail-imap.scm b/v7/src/imail/imail-imap.scm
index 1d609afdb..f20da48df 100644
--- a/v7/src/imail/imail-imap.scm
+++ b/v7/src/imail/imail-imap.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-imap.scm,v 1.73 2000/05/22 19:43:47 cph Exp $
+;;; $Id: imail-imap.scm,v 1.74 2000/05/22 19:49:57 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -840,7 +840,7 @@
 	      (set-imap-connection-folder! connection #f))
 	  #t))))
 
-(define-method close-folder ((folder <imap-folder>))
+(define-method %close-folder ((folder <imap-folder>))
   (maybe-close-imap-connection (imap-folder-connection folder))
   (set-imap-connection-folder! connection #f))
 
-- 
2.25.1