Don't define user-ptr type when user-ptrp is not present

* lisp/emacs-lisp/cl-preloaded.el (user-ptr): Condition on
presence of predicate function.

(cherry picked from commit 7206a620af2de7281d9c9299582241a10e79e1a3)

diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
index 8428ec4beb74d869cbf62ba170820834a1fb5b35..f27933ed0543f8eca880dec79776c34215c7b82d 100644 (file)
--- a/lisp/emacs-lisp/cl-preloaded.el
+++ b/lisp/emacs-lisp/cl-preloaded.el
@@ -356,8 +356,10 @@ The `slots' (and hence `index-table') are currently unused."
 (cl--define-built-in-type tree-sitter-compiled-query atom)
 (cl--define-built-in-type tree-sitter-node atom)
 (cl--define-built-in-type tree-sitter-parser atom)
-(cl--define-built-in-type user-ptr atom
-  nil :predicate user-ptrp) ;; FIXME: Shouldn't it be called `user-ptr-p'?
+(declare-function user-ptrp "data.c")
+(unless (fboundp 'user-ptrp)
+  (cl--define-built-in-type user-ptr atom nil
+                            :predicate user-ptrp)) ;; FIXME: Shouldn't it be called `user-ptr-p'?
 (cl--define-built-in-type font-object atom)
 (cl--define-built-in-type font-entity atom)
 (cl--define-built-in-type font-spec atom)