master 7206a620af2 2/2: Don't define user-ptr type when user-ptrp is not present

[Po Lu]

branch: master
commit 7206a620af2de7281d9c9299582241a10e79e1a3
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    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.
---
 lisp/emacs-lisp/cl-preloaded.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
index 8428ec4beb7..f27933ed054 100644
--- 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)