mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-06 06:20:55 -08:00
Revert "Prevent name clashes between CL structures and builtin types"
This reverts commit 151496a4b9.
That commit breaks bootstrap builds due to a cyclic dependency.
This commit is contained in:
parent
6735df4443
commit
610dad1102
5 changed files with 0 additions and 58 deletions
|
|
@ -36,7 +36,6 @@
|
|||
|
||||
;;; Code:
|
||||
|
||||
(eval-when-compile (require 'cl-generic))
|
||||
(eval-when-compile (require 'cl-lib))
|
||||
(eval-when-compile (require 'cl-macs)) ;For cl--struct-class.
|
||||
|
||||
|
|
@ -51,12 +50,6 @@
|
|||
(apply #'error string (append sargs args))
|
||||
(signal 'cl-assertion-failed `(,form ,@sargs)))))
|
||||
|
||||
(defun cl--struct-name-p (name)
|
||||
"Return t if NAME is a valid structure name for `cl-defstruct'."
|
||||
(and name (symbolp name) (not (keywordp name))
|
||||
(not (memq name (eval-when-compile cl--generic-all-builtin-types)))
|
||||
t))
|
||||
|
||||
;; When we load this (compiled) file during pre-loading, the cl--struct-class
|
||||
;; code below will need to access the `cl-struct' info, since it's considered
|
||||
;; already as its parent (because `cl-struct' was defined while the file was
|
||||
|
|
@ -117,7 +110,6 @@
|
|||
;;;###autoload
|
||||
(defun cl-struct-define (name docstring parent type named slots children-sym
|
||||
tag print)
|
||||
(cl-check-type name cl--struct-name)
|
||||
(unless type
|
||||
;; Legacy defstruct, using tagged vectors. Enable backward compatibility.
|
||||
(cl-old-struct-compat-mode 1))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue