X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmacros.lisp;h=97be928e260dcfc82ffacb71d2390309b82d4441;hb=da54f0f75754190f30f8585ff05bebd254aa4e40;hp=197ffbed9235a0a3a50000cf40331716c37c1a37;hpb=b8fe7c0afeb9901091ce781ba351d0513f2ee86d;p=sbcl.git

diff --git a/src/compiler/macros.lisp b/src/compiler/macros.lisp
index 197ffbe..97be928 100644
--- a/src/compiler/macros.lisp
+++ b/src/compiler/macros.lisp
@@ -78,8 +78,8 @@
 	     `((setf (symbol-function ',name)
 		     (lambda (&rest rest)
 		       (declare (ignore rest))
-		       (error "can't FUNCALL the SYMBOL-FUNCTION of ~
-			       special forms")))))))))
+		       (error 'special-form-function
+			      :name ',name)))))))))
 
 ;;; (This is similar to DEF-IR1-TRANSLATOR, except that we pass if the
 ;;; syntax is invalid.)
@@ -666,7 +666,9 @@
 ;;; :TEST keyword may be used to determine the name equality
 ;;; predicate.
 (defmacro lexenv-find (name slot &key test)
-  (once-only ((n-res `(assoc ,name (,(symbolicate "LEXENV-" slot) *lexenv*)
+  (once-only ((n-res `(assoc ,name (,(let ((*package* (symbol-package 'lexenv-funs)))
+                                          (symbolicate "LEXENV-" slot))
+                                     *lexenv*)
 			     :test ,(or test '#'eq))))
     `(if ,n-res
 	 (values (cdr ,n-res) t)