diff options
| author | Philipp Stephani <phst@google.com> | 2018-01-07 14:14:38 +0100 |
|---|---|---|
| committer | Philipp Stephani <phst@google.com> | 2018-01-07 14:14:38 +0100 |
| commit | 610dad1102cba5fa6111050d30c734b51bcdb77d (patch) | |
| tree | e017da7f090e2125d21dbc4d5600a444765f5277 /lisp/emacs-lisp/cl-preloaded.el | |
| parent | 6735df4443fe0aa60862a95c38746edf2b053862 (diff) | |
| download | emacs-610dad1102cba5fa6111050d30c734b51bcdb77d.tar.gz | |
Revert "Prevent name clashes between CL structures and builtin types"
This reverts commit 151496a4b96430924bc148f85b9c8471d1e132b1.
That commit breaks bootstrap builds due to a cyclic dependency.
Diffstat (limited to 'lisp/emacs-lisp/cl-preloaded.el')
| -rw-r--r-- | lisp/emacs-lisp/cl-preloaded.el | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el index 33a1438f690..4e73a4a31b7 100644 --- a/lisp/emacs-lisp/cl-preloaded.el +++ b/lisp/emacs-lisp/cl-preloaded.el @@ -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)) |