From 2b6fa1590f8760d80d522fecaec44eb9d7cf95c1 Mon Sep 17 00:00:00 2001
From: "Taylor R. Campbell" <net/mumble/campbell>
Date: Tue, 2 Sep 2008 17:19:10 +0000
Subject: [PATCH] Use the term `dynamic', not `ephemeral', for parts of a
 message that are subject to change on the server and should not be cached on
 disk, to match the RFC's terminology.

---
 v7/src/imail/imail-imap.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/v7/src/imail/imail-imap.scm b/v7/src/imail/imail-imap.scm
index 6fd7e30fb..c92e97777 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.231 2008/09/01 01:24:47 riastradh Exp $
+$Id: imail-imap.scm,v 1.232 2008/09/02 17:19:10 riastradh Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -1295,7 +1295,7 @@ USA.
 
 ;;; Keywords that are not to be written into the disk cache.
 
-(define imap-ephemeral-keywords
+(define imap-dynamic-keywords
   '(FLAGS))
 
 (define-method preload-folder-outlines ((folder <imap-folder>))
@@ -1385,7 +1385,7 @@ USA.
 (define (imap-message-keyword-cached? message keyword)
   (let ((cached-keywords (imap-message-cached-keywords message)))
     (or (memq keyword cached-keywords)
-	(memq keyword imap-ephemeral-keywords)
+	(memq keyword imap-dynamic-keywords)
 	(and (file-exists? (message-item-pathname message keyword))
 	     (begin
 	       (set-imap-message-cached-keywords!
@@ -1710,14 +1710,14 @@ USA.
 	#f)))
 
 (define (fetch-message-items message keywords suffix)
-  (if (lset= eq? keywords imap-ephemeral-keywords)
+  (if (lset= eq? keywords imap-dynamic-keywords)
       (fetch-message-items-1 message keywords suffix)
       (with-folder-locked (message-folder message)
 	(lambda ()
 	  (let ((alist
 		 (map (lambda (keyword)
 			(cons keyword
-			      (if (memq keyword imap-ephemeral-keywords)
+			      (if (memq keyword imap-dynamic-keywords)
 				  '()
                                   (let ((pathname
                                          (message-item-pathname message
@@ -1749,7 +1749,7 @@ USA.
 
 (define (cache-fetch-response message response keyword-predicate save-item)
   (for-each (lambda (keyword)
-	      (if (and (not (memq keyword imap-ephemeral-keywords))
+	      (if (and (not (memq keyword imap-dynamic-keywords))
 		       (keyword-predicate keyword))
 		  (let ((item (imap:response:fetch-attribute response keyword))
 			(pathname (message-item-pathname message keyword))
-- 
2.25.1