summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2021-10-01 23:53:20 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2021-10-01 23:53:20 -0400
commit58f8c3affc92c77832e93d4d6f0ff3a0bc0a778b (patch)
tree2d2936e1d1b55d1b622abad8cc38010a5f373065 /lisp/emacs-lisp
parent2fcd34f20275a9311ea5dc1709e5e565412ddd97 (diff)
downloademacs-58f8c3affc92c77832e93d4d6f0ff3a0bc0a778b.tar.gz
emacs-58f8c3affc92c77832e93d4d6f0ff3a0bc0a778b.tar.bz2
emacs-58f8c3affc92c77832e93d4d6f0ff3a0bc0a778b.zip
* lisp/emacs-lisp/cl-generic.el: Fix test/lisp/loadhist-tests
Revert 2fcd34f202 which was redundant anyway since e165bf3d4 had fixed it in a better way anyway (a way which doesn't litter the `load-history`).
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/cl-generic.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index 10490f0638c..2c292415cfe 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -631,14 +631,13 @@ The set of acceptable TYPEs (also called \"specializers\") is defined
(setq dispatch-idx 0))
(dotimes (i dispatch-idx)
(push (make-symbol (format "arg%d" (- dispatch-idx i 1))) fixedargs))
- ;; FIXME: We should find a way to expand `with-memoize' once and forall
- ;; so we don't need `subr-x' when we get here.
- (require 'subr-x)
;; FIXME: For generic functions with a single method (or with 2 methods,
;; one of which always matches), using a tagcode + hash-table is
;; overkill: better just use a `cl-typep' test.
(byte-compile
`(lambda (generic dispatches-left methods)
+ ;; FIXME: We should find a way to expand `with-memoize' once
+ ;; and forall so we don't need `subr-x' when we get here.
(eval-when-compile (require 'subr-x))
(let ((method-cache (make-hash-table :test #'eql)))
(lambda (,@fixedargs &rest args)