0.8.20.27:

[sbcl.git] / src / code / defmacro.lisp

diff --git a/src/code/defmacro.lisp b/src/code/defmacro.lisp
index a889710..afa964e 100644 (file)
--- a/src/code/defmacro.lisp
+++ b/src/code/defmacro.lisp
@@ -37,14 +37,14 @@
                          :environment environment)
        (let ((def `(lambda (,whole ,environment)
                      ,@local-decs
-                     (block ,name 
-                       ,new-body)))
+                      ,new-body))
              ;; If we want to move over to list-style names
              ;; [e.g. (DEFMACRO FOO), maybe to support some XREF-like
              ;; functionality] here might be a good place to start.
-             (debug-name (debug-namify "DEFMACRO ~S" name)))
+             (debug-name (sb!c::debug-name 'macro-function name)))
          `(eval-when (:compile-toplevel :load-toplevel :execute)
-             (sb!c::%defmacro ',name #',def ',lambda-list ,doc ,debug-name)))))))
+             (sb!c::%defmacro ',name #',def ',lambda-list 
+                              ,doc ',debug-name)))))))
 
 (macrolet
     ((def (times set-p)
@@ -93,8 +93,7 @@
                              lambda-list
                             (%simple-fun-name (%closure-fun definition))
                             debug-name))
-                      ((#.sb!vm:simple-fun-header-widetag
-                        #.sb!vm:closure-fun-header-widetag)
+                      (#.sb!vm:simple-fun-header-widetag
                        (setf (%simple-fun-arglist definition) lambda-list
                             (%simple-fun-name definition) debug-name))))
             name))))