diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2022-06-24 10:54:01 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2022-06-24 11:04:51 +0200 |
| commit | 49910adf872a98d9c144d34478a53ecb3e01856f (patch) | |
| tree | e5b69dc0e59565cfd537ae14ba0dffef107de619 /test/lisp/emacs-lisp/cconv-tests.el | |
| parent | 2ff5cb4cb4420e2b18ea8451ad0b29f1a69bdb6c (diff) | |
| download | emacs-49910adf872a98d9c144d34478a53ecb3e01856f.tar.gz | |
Fix cl-generic bootstrap problems
* lisp/sqlite-mode.el (require):
* lisp/net/eudc.el (require):
* lisp/arc-mode.el (require): Require subr-x, since these files
are using macros from there.
* lisp/emacs-lisp/subr-x.el (with-memoization): Move from here...
* lisp/subr.el (with-memoization): ... to here, as it's used from
the preloaded cl-generic.el file.
* lisp/emacs-lisp/cl-generic.el (cl--generic-compiler): Don't use
the autoloaded `byte-compile' function during bootstrap.
(cl--generic-get-dispatcher): Don't require subr-x, either.
cl-generic has been preloaded since 2015, and most usages of it (in
preloaded files) work fine. In particular, using `cl-defgeneric' is
unproblematic. However, `cl-defmethod' would end up pulling in the
byte compiler (at load time), which would make it impossible to use
`cl-defmethod' in pre-loaded files, and this change fixes that (but
possibly not in the most self-evidently correct way).
Diffstat (limited to 'test/lisp/emacs-lisp/cconv-tests.el')
| -rw-r--r-- | test/lisp/emacs-lisp/cconv-tests.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/lisp/emacs-lisp/cconv-tests.el b/test/lisp/emacs-lisp/cconv-tests.el index 0668e44ba51..9904c6a969c 100644 --- a/test/lisp/emacs-lisp/cconv-tests.el +++ b/test/lisp/emacs-lisp/cconv-tests.el @@ -24,6 +24,7 @@ (require 'ert) (require 'cl-lib) (require 'generator) +(require 'bytecomp) (ert-deftest cconv-tests-lambda-:documentation () "Docstring for lambda can be specified with :documentation." |