* liece-clfns.el: Require `pym'.

[elisp/liece.git] / lisp / liece-clfns.el

diff --git a/lisp/liece-clfns.el b/lisp/liece-clfns.el
index a76ea7a..3858949 100644 (file)
--- a/lisp/liece-clfns.el
+++ b/lisp/liece-clfns.el
@@ -30,13 +30,19 @@
 
 ;;; Code:
 
+(require 'pym)
+
+(defmacro liece-clfns-subr-fboundp (symbol)
+  "Return t if SYMBOL's function definition is a basic function."
+  (or (subr-fboundp symbol)
+      (string-equal (symbol-file symbol) "subr")))
+
 (if (featurep 'xemacs)
     nil
   (require 'cl)
 
   (define-compiler-macro last (&whole form x &optional n)
-    (if (and (fboundp 'last)
-            (subrp (symbol-function 'last)))
+    (if (liece-clfns-subr-fboundp 'last)
        form
       (if n
          `(let* ((x ,x) (n ,n) (m 0) (p x))
@@ -54,8 +60,7 @@
           x))))
 
   (define-compiler-macro member-if (&whole form pred list)
-    (if (and (fboundp 'member-if)
-            (subrp (symbol-function 'member-if)))
+    (if (liece-clfns-subr-fboundp 'member-if)
        form
       `(let ((fn ,pred)
             (seq ,list))
@@ -64,8 +69,7 @@
         seq)))
 
   (define-compiler-macro member-if-not (&whole form pred list)
-    (if (and (fboundp 'member-if-not)
-            (subrp (symbol-function 'member-if-not)))
+    (if (liece-clfns-subr-fboundp 'member-if-not)
        form
       `(let ((fn ,pred)
             (seq ,list))
@@ -74,8 +78,7 @@
         seq)))
   
   (define-compiler-macro delete-if (&whole form pred list)
-    (if (and (fboundp 'delete-if)
-            (subrp (symbol-function 'delete-if)))
+    (if (liece-clfns-subr-fboundp 'delete-if)
        form
       `(let* ((fn ,pred) (seq ,list) (p seq))
         (while (and p (not (funcall fn (car p))))
@@ -83,8 +86,7 @@
         (if p (delq (car p) seq)))))
 
   (define-compiler-macro remove-if (&whole form pred list)
-    (if (and (fboundp 'remove-if)
-            (subrp (symbol-function 'remove-if)))
+    (if (liece-clfns-subr-fboundp 'remove-if)
        form
       `(let* ((fn ,pred) (seq (copy-sequence ,list)) (p seq))
         (while (and p (not (funcall fn (car p))))
@@ -92,8 +94,7 @@
         (if p (delq (car p) seq) seq))))
 
   (define-compiler-macro remove-if-not (&whole form pred list)
-    (if (and (fboundp 'remove-if-not)
-            (subrp (symbol-function 'remove-if-not)))
+    (if (liece-clfns-subr-fboundp 'remove-if-not)
        form
       `(let* ((fn ,pred) (seq (copy-sequence ,list)) (p seq))
         (while (and p (funcall fn (car p)))
@@ -101,8 +102,7 @@
         (if p (delq (car p) seq) seq))))
 
   (define-compiler-macro assoc-if (&whole form pred list)
-    (if (and (fboundp 'assoc-if)
-            (subrp (symbol-function 'assoc-if)))
+    (if (liece-clfns-subr-fboundp 'assoc-if)
        form
       `(let ((fn ,pred) (seq ,list))
         (while (and seq (not (funcall fn (caar seq))))
@@ -110,8 +110,7 @@
         (car seq))))
 
   (define-compiler-macro rassoc-if (&whole form pred list)
-    (if (and (fboundp 'rassoc-if)
-            (subrp (symbol-function 'rassoc-if)))
+    (if (liece-clfns-subr-fboundp 'rassoc-if)
        form
       `(let ((fn ,pred) (seq ,list))
         (while (and seq (not (funcall fn (cdar seq))))