Blabla

* src/lread.c (Fintern): Remove comment.
* src/pkg.c (pkg_emacs_intern_soft): Don't assume *package* if
a vector was passed in for a package.  Assert instead elsewhere.

diff --git a/src/lread.c b/src/lread.c
index ba398122bd763b7a6b7cd12073ccddcbdc111f7d..a2bafec2917874064f30f950ed3857a58f3d7675 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -4785,7 +4785,6 @@ A second optional argument specifies the obarray to use;
 it defaults to the value of `obarray'.  */)
   (Lisp_Object string, Lisp_Object package)
 {
-  /* PKG-FIXME: What's the right thing to do */
   eassert (SREF (string, 0) != ':');
   return pkg_emacs_intern (string, package);
 }

diff --git a/src/pkg.c b/src/pkg.c
index 7ae294fa839ad15b34a806056b5b40b91d05d6ed..60cd4573ff1b2cb817d8e855822c1402477b9519 100644 (file)
--- a/src/pkg.c
+++ b/src/pkg.c
@@ -661,12 +661,7 @@ pkg_emacs_intern_soft (Lisp_Object symbol, Lisp_Object package)
   const Lisp_Object name = SYMBOLP (symbol) ? SYMBOL_NAME (symbol) : symbol;
   CHECK_STRING (name);
 
-  /* This is presumable an obarray, and we are intending
-     to intern into the default pacakge.  */
-  if (VECTORP (package))
-    package = Vearmuffs_package;
   package = package_or_default (package);
-
   Lisp_Object found = lookup_symbol (name, package);
   if (!EQ (found, Qunbound))
     {