From 09d67716e5492306c0bf704e6538d22a5bc76405 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 27 Mar 2020 17:14:34 -0400
Subject: [PATCH] * lisp/emacs-lisp/cl-macs.el (cl-defstruct): Declare the type
 immediately

---
 lisp/emacs-lisp/cl-macs.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 954731b06b8..7f5d197b532 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2868,7 +2868,9 @@ Supported keywords for slots are:
                     (append pred-form '(t))
                   `(and ,pred-form t)))
             forms)
-      (push `(put ',name 'cl-deftype-satisfies ',predicate) forms))
+      (push `(eval-and-compile
+               (put ',name 'cl-deftype-satisfies ',predicate))
+            forms))
     (let ((pos 0) (descp descs))
       (while descp
 	(let* ((desc (pop descp))
@@ -3138,6 +3140,7 @@ Of course, we really can't know that for sure, so it's just a heuristic."
                  ;; "Obvious" mappings.
                  (string	. stringp)
                  (list		. listp)
+                 (cons		. consp)
                  (symbol	. symbolp)
                  (function	. functionp)
                  (integer	. integerp)
-- 
2.39.5