From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 17 Jun 1997 08:40:02 +0000 (+0000)
Subject: Change slot-option merging code so that INITIAL-VALUE and INITIALIZER
X-Git-Tag: 20090517-FFI~5129
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=dace26e66413cfd099931bf37282e053e08424ef;p=mit-scheme.git

Change slot-option merging code so that INITIAL-VALUE and INITIALIZER
shadow each other properly.
---

diff --git a/v7/src/sos/slot.scm b/v7/src/sos/slot.scm
index 759946764..b3f699007 100644
--- a/v7/src/sos/slot.scm
+++ b/v7/src/sos/slot.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: slot.scm,v 1.2 1997/06/17 08:10:41 cph Exp $
+;;; $Id: slot.scm,v 1.3 1997/06/17 08:40:02 cph Exp $
 ;;;
 ;;; Copyright (c) 1995-96 Massachusetts Institute of Technology
 ;;;
@@ -192,9 +192,9 @@
 		   (or (list-search-positive interacting-options
 			 (lambda (names)
 			   (memq (car x) names)))
-		       (list names))))
+		       (list (car x)))))
 	      (let ((entry
-		     (let loop ((names interaction))
+		     (let loop ((names names))
 		       (and (not (null? names))
 			    (or (assq (car names) (cdr result))
 				(loop (cdr names)))))))