Don't duplicate logic that is already available in "rmail.scm"; share

it.

diff --git a/v7/src/imail/imail-rmail.scm b/v7/src/imail/imail-rmail.scm
index 3574dcfe820cd6c61ef4992ccb0abfc1c73f3268..c12e6fb580f61166ce2774a53781f434fe1bd3ee 100644 (file)
--- 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 1b173ab7a89d73f018745994b61f4c7af5187c6b..f56729e6e37c59aa3a6b492348726a80a2e87b02 100644 (file)
--- 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