From 9ea12179fffffa8e1ba12cde4a10c35504a80012 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Wed, 10 Jun 2009 00:03:52 +0200
Subject: [PATCH] fix debug-options

* module/ice-9/boot-9.scm (define-option-interface): Fix (debug-options
  'full), along with other options. Thanks to Mark Weaver for the tip.

* THANKS: Update, though many more names need to be added.
---
 THANKS                  |  2 ++
 module/ice-9/boot-9.scm | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/THANKS b/THANKS
index e3cf1e37c..748605c1a 100644
--- a/THANKS
+++ b/THANKS
@@ -93,6 +93,7 @@ For fixes or providing information which led to a fix:
           Scott Shedden
            Alex Shinn
          Daniel Skarda
+           Dale Smith
           Cesar Strauss
          Rainer Tammer
         Richard Todd
@@ -108,6 +109,7 @@ For fixes or providing information which led to a fix:
 	Andreas Vögele
         Michael Talbot-Wilson
         Michael Tuexen
+        Mark H. Weaver
             Jon Wilson
            Andy Wingo
           Keith Wright
diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index a2600491b..78b194aa3 100644
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -2324,9 +2324,9 @@ module '(ice-9 q) '(make-q q-length))}."
 ;;;
 
 (defmacro define-option-interface (option-group)
-  (let* ((option-name car)
-	 (option-value cadr)
-	 (option-documentation caddr)
+  (let* ((option-name 'car)
+	 (option-value 'cadr)
+	 (option-documentation 'caddr)
 
 	 ;; Below follow the macros defining the run-time option interfaces.
 
@@ -2337,15 +2337,15 @@ module '(ice-9 q) '(make-q q-length))}."
 				   (,interface (car args)) (,interface))
 				  (else (for-each
                                          (lambda (option)
-                                           (display (option-name option))
+                                           (display (,option-name option))
                                            (if (< (string-length
-                                                   (symbol->string (option-name option)))
+                                                   (symbol->string (,option-name option)))
                                                   8)
                                                (display #\tab))
                                            (display #\tab)
-                                           (display (option-value option))
+                                           (display (,option-value option))
                                            (display #\tab)
-                                           (display (option-documentation option))
+                                           (display (,option-documentation option))
                                            (newline))
                                          (,interface #t)))))))
 
-- 
2.20.1