2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f7e68e10..f8f252c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2015-04-25  Kaz Kylheku  <kaz@kylheku.com>
 
+	* lib.c (symbol_package): If the argument is nil, return
+	the user package directly, not the value of the *user-package*
+	variable.
+
+2015-04-25  Kaz Kylheku  <kaz@kylheku.com>
+
 	Remove silly package lookup from keywordp.
 
 	This tiny change yields a 165% (2.65X) speedup in the
diff --git a/lib.c b/lib.c
index 03316881..c4c3edae 100644
--- a/lib.c
+++ b/lib.c
@@ -3511,7 +3511,7 @@ static void symbol_setname(val sym, val name)
 val symbol_package(val sym)
 {
   if (sym == nil)
-    return user_package;
+    return user_package_var;
   type_check(sym, SYM);
   return sym->s.package;
 }