From b6178a43369e7c0d4cf0c6e770ee7658ea40afc7 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 7 Apr 2000 19:39:10 +0000
Subject: [PATCH] Don't duplicate logic that is already available in
 "rmail.scm"; share it.

---
 v7/src/imail/imail-rmail.scm | 4 ++--
 v7/src/imail/imail.pkg       | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/v7/src/imail/imail-rmail.scm b/v7/src/imail/imail-rmail.scm
index 3574dcfe8..c12e6fb58 100644
--- a/v7/src/imail/imail-rmail.scm
+++ b/v7/src/imail/imail-rmail.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-rmail.scm,v 1.16 2000/04/07 19:12:24 cph Exp $
+;;; $Id: imail-rmail.scm,v 1.17 2000/04/07 19:39:10 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -282,7 +282,7 @@
 		  (lambda (filename)
 		    (merge-pathnames (string-trim filename) directory)))
 		(burst-string inboxes #\, #f)))
-	  ((pathname=? (edwin-variable 'RMAIL-FILE-NAME)
+	  ((pathname=? (edwin-variable-value 'RMAIL-FILE-NAME)
 		       (url-body (folder-url folder)))
 	   (edwin-variable-value 'RMAIL-PRIMARY-INBOX-LIST))
 	  (else '()))))
diff --git a/v7/src/imail/imail.pkg b/v7/src/imail/imail.pkg
index 1b173ab7a..f56729e6e 100644
--- a/v7/src/imail/imail.pkg
+++ b/v7/src/imail/imail.pkg
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail.pkg,v 1.1 2000/01/18 20:57:41 cph Exp $
+;;; $Id: imail.pkg,v 1.2 2000/04/07 19:38:55 cph Exp $
 ;;;
 ;;; Copyright (c) 2000 Massachusetts Institute of Technology
 ;;;
@@ -32,4 +32,7 @@
 	 "imail-rmail"
 	 "imail-umail"
 	 "imail-top")
-  (parent (edwin)))
\ No newline at end of file
+  (parent (edwin))
+  (import (edwin rmail)
+	  guarantee-rmail-variables-initialized
+	  rmail-spool-directory))
\ No newline at end of file
-- 
2.25.1