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 759946764e5da3e4f06ba414f71482040267355b..b3f699007e6e1805c84b3e3a5b12f867c63d71da 100644 (file)
--- 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)))))))