[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/pkg 25efac69971 1/3: Revert "Compiler macros for intern and inte
From: |
Gerd Moellmann |
Subject: |
scratch/pkg 25efac69971 1/3: Revert "Compiler macros for intern and intern-soft" |
Date: |
Wed, 2 Aug 2023 07:55:55 -0400 (EDT) |
branch: scratch/pkg
commit 25efac6997113dcc25d20da4c8975427d832affa
Author: Gerd Möllmann <gerd@gnu.org>
Commit: Gerd Möllmann <gerd@gnu.org>
Revert "Compiler macros for intern and intern-soft"
This reverts commit 0da95fb682a5dba762ad7d0a98bb1d111ec1f2f5.
---
lisp/emacs-lisp/bytecomp.el | 14 --------------
src/pkg.c | 9 +--------
2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index cef4e4902bc..960debd1660 100644
--- 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 e2fc8c5e8f7..52d05a69e26 100644
--- 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");