X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fparse-defmacro-errors.lisp;h=456c35271db8fbd64a1c9b6013e4a511d129be56;hb=3b45a7b66afe95080562d266dd447b1286abece0;hp=cea6ca629ea7c87f34a88555632a8281ca715878;hpb=de201aeb12169d0bd377eca4da6116c2797a66ad;p=sbcl.git

diff --git a/src/code/parse-defmacro-errors.lisp b/src/code/parse-defmacro-errors.lisp
index cea6ca6..456c352 100644
--- a/src/code/parse-defmacro-errors.lisp
+++ b/src/code/parse-defmacro-errors.lisp
@@ -17,10 +17,10 @@
 
 ;;; We save space in macro definitions by calling this function.
 (defun do-arg-count-error (error-kind name arg lambda-list minimum maximum)
-  (multiple-value-bind (fname sb!debug:*stack-top-hint*) (find-caller-name)
+  (multiple-value-bind (fname sb!debug:*stack-top-hint*)
+      (find-caller-name-and-frame)
     (error 'defmacro-ll-arg-count-error
 	   :kind error-kind
-	   :function-name fname
 	   :name name
 	   :argument arg
 	   :lambda-list lambda-list
@@ -34,15 +34,10 @@
 	 :initform nil)))
 
 (defun print-defmacro-ll-bind-error-intro (condition stream)
-  (if (null (defmacro-lambda-list-bind-error-name condition))
-      (format stream
-	      "error while parsing arguments to ~A in ~S:~%"
-	      (defmacro-lambda-list-bind-error-kind condition)
-	      (condition-function-name condition))
-      (format stream
-	      "error while parsing arguments to ~A ~S:~%"
-	      (defmacro-lambda-list-bind-error-kind condition)
-	      (defmacro-lambda-list-bind-error-name condition))))
+  (format stream
+	  "error while parsing arguments to ~A~@[ ~S~]:~%"
+	  (defmacro-lambda-list-bind-error-kind condition)
+	  (defmacro-lambda-list-bind-error-name condition)))
 
 (define-condition defmacro-bogus-sublist-error
 		  (defmacro-lambda-list-bind-error)