From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 1 Oct 2021 19:34:09 +0000 (-0400)
Subject: * lisp/emacs-lisp/cl-generic.el (cl--generic-get-dispatcher): Fix regression
X-Git-Tag: emacs-29.0.90~3671^2~690
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2fcd34f202;p=emacs.git

* lisp/emacs-lisp/cl-generic.el (cl--generic-get-dispatcher): Fix regression
---

diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index a2bcad2d3aa..10490f0638c 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -631,6 +631,9 @@ 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.