Always run SAVE-FOLDER as part of CLOSE-FOLDER.

diff --git a/v7/src/imail/imail-core.scm b/v7/src/imail/imail-core.scm
index c725bb219fb200278dcea97fa0d53a976d3064a1..363fca89fac18c2d1c2e335691ed5e6ed2ebcf89 100644 (file)
--- 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 f976f6131e6f2df8caedc11f9d4ef8e47f1a8c90..729d100863731ac0c42ed9e5612a2882d9ed3975 100644 (file)
--- 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 1d609afdbb0bc048020f336a57b914ed76a590cd..f20da48df27b86a1e4461842a8d7ffeb0dcfedc8 100644 (file)
--- 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))