From: Gerd Möllmann <gerd@gnu.org>
Date: Sat, 15 Oct 2022 12:16:27 +0000 (+0200)
Subject: Blabla
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f6b80ef5a581dbe9002cd9fdb9cb60c282b42385;p=emacs.git

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 ba398122bd7..a2bafec2917 100644
--- 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 7ae294fa839..60cd4573ff1 100644
--- 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))
     {