From 324633c794387a283badaffeaaea281d615dec6b Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 7 Jan 2000 23:09:17 +0000
Subject: [PATCH] Fix a handful of small bugs.

---
 v7/src/imail/imail-core.scm  | 20 ++++++++++----------
 v7/src/imail/imail-rmail.scm |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/v7/src/imail/imail-core.scm b/v7/src/imail/imail-core.scm
index 2dc45cf37..439e05050 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.1 2000/01/04 22:50:53 cph Exp $
+;;; $Id: imail-core.scm,v 1.2 2000/01/07 23:08:48 cph Exp $
 ;;;
 ;;; Copyright (c) 1999 Massachusetts Institute of Technology
 ;;;
@@ -214,7 +214,7 @@
 ;; error for invalid INDEX.
 (define (get-message folder index)
   (guarantee-index index 'GET-MESSAGE)
-  (if (not (fix:< index (length (count-messages folder))))
+  (if (not (fix:< index (count-messages folder)))
       (error:bad-range-argument index 'GET-MESSAGE))
   (%get-message folder index))
 
@@ -313,7 +313,7 @@
 		      headers*
 		      (append! (reverse! (cdr flags*)) flags)
 		      properties)))
-	  ((header-field->message-property header)
+	  ((header-field->message-property (car headers))
 	   => (lambda (property)
 		(loop (cdr headers)
 		      headers*
@@ -409,14 +409,14 @@
 (define (set-message-property message name value)
   (guarantee-message-property-name name 'SET-MESSAGE-PROPERTY)
   (guarantee-message-property-value value 'SET-MESSAGE-PROPERTY)
-  (let ((headers (message-properties message)))
-    (let loop ((headers headers))
-      (if (pair? headers)
-	  (if (string-ci=? name (caar headers))
-	      (set-cdr! (car headers) value)
-	      (loop (cdr headers)))
+  (let ((alist (message-properties message)))
+    (let loop ((alist* alist))
+      (if (pair? alist*)
+	  (if (string-ci=? name (caar alist*))
+	      (set-cdr! (car alist*) value)
+	      (loop (cdr alist*)))
 	  (set-message-properties! message
-				   (cons (cons name value) headers))))))
+				   (cons (cons name value) alist))))))
 
 (define (message-property-name? object)
   (header-field-name? object))
diff --git a/v7/src/imail/imail-rmail.scm b/v7/src/imail/imail-rmail.scm
index 6cdde14c1..5b6e33c43 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.1 2000/01/04 22:51:02 cph Exp $
+;;; $Id: imail-rmail.scm,v 1.2 2000/01/07 23:09:17 cph Exp $
 ;;;
 ;;; Copyright (c) 1999 Massachusetts Institute of Technology
 ;;;
@@ -44,10 +44,10 @@
 
 (define-class (<rmail-folder> (constructor (url header-fields messages)))
     (<file-folder>)
-  (header-fields define standard accessor header-fields))
+  (header-fields accessor header-fields define modifier))
 
 (define-method %write-folder ((folder <folder>) (url <rmail-url>))
-  (write-rmail-file folder (file-url-pathname url)))
+  (write-rmail-file folder url))
 
 (define-method poll-folder ((folder <rmail-folder>))
   (rmail-get-new-mail folder))
@@ -249,7 +249,7 @@
 	     (lambda (n.v)
 	       (string-ci=? "summary-line" (car n.v))))))
       (if summary-line
-	  (%write-header-field (car n.v) (cdr n.v) port)))
+	  (%write-header-field (car summary-line) (cdr summary-line) port)))
     (for-each
      (lambda (n.v)
        (if (not (or (string-ci=? "summary-line" (car n.v))
-- 
2.25.1