From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 2 Oct 2021 03:53:20 +0000 (-0400)
Subject: * lisp/emacs-lisp/cl-generic.el: Fix test/lisp/loadhist-tests
X-Git-Tag: emacs-29.0.90~3671^2~689
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=58f8c3affc92c77832e93d4d6f0ff3a0bc0a778b;p=emacs.git

* 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`).
---

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)