From c8df99730a6d2eaaaa6bd1216c4c7394a691ee7f Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Wed, 24 Feb 2010 23:20:38 +0100
Subject: [PATCH] (ice-9 control) fixes

* module/ice-9/control.scm (%): Fix to allow tagged and default-tagged
  prompts.
  (abort): Re-export.
---
 module/ice-9/control.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/module/ice-9/control.scm b/module/ice-9/control.scm
index a621e8d7c..482a24e2b 100644
--- a/module/ice-9/control.scm
+++ b/module/ice-9/control.scm
@@ -19,7 +19,7 @@
 ;;; Code:
 
 (define-module (ice-9 control)
-  #:re-export (prompt)
+  #:re-export (prompt abort)
   #:export (% control))
 
 ;; the same as abort.
@@ -29,4 +29,10 @@
 (define-syntax %
   (syntax-rules ()
     ((_ expr handler)
-     (prompt (lambda () expr) handler))))
+     (prompt (fluid-ref %default-prompt-tag)
+             (lambda () expr)
+             handler))
+    ((_ tag expr handler)
+     (prompt tag
+             (lambda () expr)
+             handler))))