From d6a1a177a9dced0c7cd998aec23cb8c397d67cca Mon Sep 17 00:00:00 2001
From: Abdulaziz Ghuloum <aghuloum@cs.indiana.edu>
Date: Wed, 21 Nov 2007 02:23:29 -0500
Subject: [PATCH] Fixes bug 163982: Extra "" irritant in expander error

---
 scheme/last-revision       |  2 +-
 scheme/psyntax.expander.ss | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/scheme/last-revision b/scheme/last-revision
index 7d58aa7..d878b32 100644
--- a/scheme/last-revision
+++ b/scheme/last-revision
@@ -1 +1 @@
-1099
+1100
diff --git a/scheme/psyntax.expander.ss b/scheme/psyntax.expander.ss
index b727af1..be01319 100644
--- a/scheme/psyntax.expander.ss
+++ b/scheme/psyntax.expander.ss
@@ -3358,9 +3358,15 @@
     (lambda (x . args)
       (unless (for-all string? args)
         (error 'syntax-error "invalid argument" args))
-      (error 'expander "invalid syntax"
-          (stx->datum x) (apply string-append args))))
-  
+      (raise 
+        (condition 
+          (make-who-condition 'expander)
+          (make-message-condition
+            (if (null? args) 
+                "invalid syntax"
+                (apply string-append args)))
+          (stx->datum x)))))
+
   (define identifier? (lambda (x) (id? x)))
   
   (define datum->syntax