[armedbear-cvs] r13048 - branches/0.23.x/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Thu Nov 25 09:10:33 2010
New Revision: 13048

Log:
Backport DEFUN expansion fixes after loading the precompiler.

Modified:
   branches/0.23.x/abcl/src/org/armedbear/lisp/precompiler.lisp

Modified: branches/0.23.x/abcl/src/org/armedbear/lisp/precompiler.lisp
==============================================================================
--- branches/0.23.x/abcl/src/org/armedbear/lisp/precompiler.lisp	(original)
+++ branches/0.23.x/abcl/src/org/armedbear/lisp/precompiler.lisp	Thu Nov 25 09:10:33 2010
@@ -1159,14 +1159,16 @@
                   ;; Both COMPILE and COMPILE-FILE bind this variable.
                   ;; This function is also triggered by MACROEXPAND, though
                   jvm::*file-compilation*)
-             `(fset ',name ,lambda-expression))
+             `(progn
+                (fset ',name ,lambda-expression)
+                ',name))
             (t
              (when (and env (empty-environment-p env))
                (setf env nil))
              (when (null env)
                (setf lambda-expression (precompiler:precompile-form lambda-expression nil)))
-             `(progn
-                (%defun ',name ,lambda-expression)
+             `(prog1
+                  (%defun ',name ,lambda-expression)
                 ,@(when doc
                    `((%set-documentation ',name 'function ,doc)))))))))