From d7c91d74b659c0bc5afb9bb79ba0b729ab7f14d8 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 19 Oct 2023 10:21:22 -0400 Subject: [PATCH] (cl--typeof-types): Complete last change * lisp/emacs-lisp/cl-preloaded.el (cl--typeof-types): Add `integer-or-marker` in the hierarchy as well. --- lisp/emacs-lisp/cl-preloaded.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el index 96e288db7d5..27603ae8626 100644 --- a/lisp/emacs-lisp/cl-preloaded.el +++ b/lisp/emacs-lisp/cl-preloaded.el @@ -52,12 +52,12 @@ (defconst cl--typeof-types ;; Hand made from the source code of `type-of'. - '((integer number number-or-marker atom) + '((integer number integer-or-marker number-or-marker atom) (symbol-with-pos symbol atom) (symbol atom) (string array sequence atom) (cons list sequence) ;; Markers aren't `numberp', yet they are accepted wherever integers are ;; accepted, pretty much. - (marker number-or-marker atom) + (marker integer-or-marker number-or-marker atom) (overlay atom) (float number number-or-marker atom) (window-configuration atom) (process atom) (window atom) ;; FIXME: We'd want to put `function' here, but that's only true @@ -65,7 +65,7 @@ (subr atom) ;; FIXME: We should probably reverse the order between ;; `compiled-function' and `byte-code-function' since arguably - ;; `subr' and also "compiled functions" but not "byte code functions", + ;; `subr' is also "compiled functions" but not "byte code functions", ;; but it would require changing the value returned by `type-of' for ;; byte code objects, which risks breaking existing code, which doesn't ;; seem worth the trouble. -- 2.39.2