Revert "Compiler macros for intern and intern-soft"

This reverts commit 0da95fb682a5dba762ad7d0a98bb1d111ec1f2f5.

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index cef4e4902bcdf2d6f6e5f36ff7dafe8e208a3d54..960debd1660c6c711251a32bcf538065aed4b871 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -131,20 +131,6 @@
 (eval-when-compile (require 'cl-lib))
 (eval-when-compile (require 'subr-x))
 
-(defun byte-code-expand-for-package-prefixes (form)
-  (let ((cl (if package-prefixes :set-by-compiler :unset-by-compiler)))
-    (pcase form
-      (`(,_ ,_ ,_ ,_) form)
-      (`(,_ ,_ ,_) (append form (list cl)))
-      (`(,_ ,_) (append form (list nil cl)))
-      (_ form))))
-
-(cl-define-compiler-macro intern (&whole form _name &optional _package _cl)
-  (byte-code-expand-for-package-prefixes form))
-
-(cl-define-compiler-macro intern-soft (&whole form _name &optional _package _cl)
-  (byte-code-expand-for-package-prefixes form))
-
 ;; The feature of compiling in a specific target Emacs version
 ;; has been turned off because compile time options are a bad idea.
 (defgroup bytecomp nil

diff --git a/src/pkg.c b/src/pkg.c
index e2fc8c5e8f71cc12bd3f386b595134398efc60a7..52d05a69e26f882fd9588576a9b087dcc0188fdc 100644 (file)
--- a/src/pkg.c
+++ b/src/pkg.c
@@ -518,12 +518,7 @@ pkg_fake_me_an_obarray (Lisp_Object vector)
   return package;
 }
 
-/* Implements Emacs' traditional Fintern function.
-
-   CL can be one of
-
-   :set-by-compiler - intern seen by compiler with package-prefixes nil.
-   :set-by-compiler - intern seen by compiler with package-prefixes non-nil. */
+/* Implements Emacs' traditional Fintern function.  */
 
 Lisp_Object
 pkg_emacs_intern (Lisp_Object name, Lisp_Object package, Lisp_Object cl)
@@ -923,8 +918,6 @@ DEFUN ("watch-*package*", Fwatch_earmuffs_package, Swatch_earmuffs_package,
 void
 init_pkg_once (void)
 {
-  DEFSYM (QCset_by_compiler, ":set-by-compiler");
-  DEFSYM (QCunset_by_compiler, ":unset-by-compiler");
   DEFSYM (QCexternal, ":external");
   DEFSYM (QCinherited, ":inherited");
   DEFSYM (QCinternal, ":internal");