From 58f8c3affc92c77832e93d4d6f0ff3a0bc0a778b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 1 Oct 2021 23:53:20 -0400 Subject: [PATCH] * 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`). --- lisp/emacs-lisp/cl-generic.el | 5 ++--- 1 file 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) -- 2.39.5