X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Freader.lisp;h=41145889555ba7e41b9518b99aca2817cdc79282;hb=86210c4e406c1b2ff10cc3bac0e71435867db48b;hp=69d1a6f9df0da2b50e3a2c486ddb99aefab03575;hpb=c713eb2b521b048ff2c927ec52b861787d289f85;p=sbcl.git

diff --git a/src/code/reader.lisp b/src/code/reader.lisp
index 69d1a6f..4114588 100644
--- a/src/code/reader.lisp
+++ b/src/code/reader.lisp
@@ -1307,15 +1307,20 @@
   #!+sb-doc
   "Return the macro character function for SUB-CHAR under DISP-CHAR
    or NIL if there is no associated function."
-  (unless (digit-char-p sub-char)
-    (let* ((sub-char (char-upcase sub-char))
-	   (rt (or rt *standard-readtable*))
-	   (dpair (find disp-char (dispatch-tables rt)
-			:test #'char= :key #'car)))
-      (if dpair
-	  (elt (the simple-vector (cdr dpair))
-	       (char-code sub-char))
-	  (error "~S is not a dispatch char." disp-char)))))
+  (let* ((sub-char (char-upcase sub-char))
+         (rt (or rt *standard-readtable*))
+         (dpair (find disp-char (dispatch-tables rt)
+                      :test #'char= :key #'car)))
+    (if dpair
+        (let ((dispatch-fun (elt (the simple-vector (cdr dpair))
+                                 (char-code sub-char))))
+	  ;; Digits are also initialized in a dispatch table to
+	  ;; #'dispatch-char-error; READ-DISPATCH-CHAR handles them
+	  ;; separately. - CSR, 2002-04-12
+          (if (eq dispatch-fun #'dispatch-char-error)
+              nil
+              dispatch-fun))
+        (error "~S is not a dispatch char." disp-char))))
 
 (defun read-dispatch-char (stream char)
   ;; Read some digits.