Mark compat alias in cus-face.el obsolete

* lisp/cus-face.el (custom-facep): Mark compat alias obsolete.
* lisp/cus-dep.el (custom-make-dependencies):
* lisp/cus-edit.el (customize-changed-options)
(custom-unsaved-options, customize-saved, customize-apropos)
(custom-save-faces): Adjust callers.

diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 9003b7fc1b5144c7ded6d7c0706852ebd9e21132..db2c444638731350c09e7a4ba6b6b134b3751910 100644 (file)
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -204,7 +204,7 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
                    (setq where (get symbol 'custom-where))
                    (when where
                      (if (or (custom-variable-p symbol)
-                             (custom-facep symbol))
+                              (facep symbol))
                          ;; This means it's a variable or a face.
                          (progn
                            (if (assoc version version-alist)

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index b46be39e381eda3da306aff0426ee0fd9d5046bc..eceba8fa4d66df470113e6ee7654fd5dc43bb368 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1295,7 +1295,7 @@ that were added or redefined since that version."
                   (push (list symbol 'custom-group) found))
               (if (custom-variable-p symbol)
                   (push (list symbol 'custom-variable) found))
-              (if (custom-facep symbol)
+               (if (facep symbol)
                   (push (list symbol 'custom-face) found)))))))
     (if found
         (custom-buffer-create (custom--filter-obsolete-variables
@@ -1406,7 +1406,7 @@ symbols `custom-face' or `custom-variable'."
     (mapatoms (lambda (symbol)
                (and (or (get symbol 'customized-face)
                         (get symbol 'customized-face-comment))
-                    (custom-facep symbol)
+                     (facep symbol)
                     (push (list symbol 'custom-face) found))
                (and (or (get symbol 'customized-value)
                         (get symbol 'customized-variable-comment))
@@ -1453,7 +1453,7 @@ symbols `custom-face' or `custom-variable'."
     (mapatoms (lambda (symbol)
                (and (or (get symbol 'saved-face)
                         (get symbol 'saved-face-comment))
-                    (custom-facep symbol)
+                     (facep symbol)
                     (push (list symbol 'custom-face) found))
                (and (or (get symbol 'saved-value)
                         (get symbol 'saved-variable-comment))
@@ -1491,7 +1491,7 @@ If TYPE is `groups', include only groups."
              (if (get symbol 'custom-group)
                  (push (list symbol 'custom-group) found)))
          (if (memq type '(nil faces))
-             (if (custom-facep symbol)
+             (if (facep symbol)
                  (push (list symbol 'custom-face) found)))
          (if (memq type '(nil options))
              (if (and (boundp symbol)
@@ -4898,7 +4898,7 @@ This function does not save the buffer."
        (let ((spec (car-safe (get symbol 'theme-face)))
              (value (get symbol 'saved-face))
              (now (not (or (get symbol 'face-defface-spec)
-                           (and (not (custom-facep symbol))
+                            (and (not (facep symbol))
                                 (not (get symbol 'force-face))))))
              (comment (get symbol 'saved-face-comment)))
          (when (or (and spec (eq (nth 0 spec) 'user))

diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index cc766aa4509c359d1985977992426c3d101dc68f..199a76e5cc82af3319449c71ffc42ed34a41d5bc 100644 (file)
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -27,8 +27,6 @@
 
 ;;; Code:
 
-(defalias 'custom-facep 'facep)
-
 ;;; Declaring a face.
 
 (defun custom-declare-face (face spec doc &rest args)
@@ -394,6 +392,8 @@ Each of the arguments ARGS has this form:
 This means reset FACE to its value in FROM-THEME."
   (apply 'custom-theme-reset-faces 'user args))
 
+(define-obsolete-function-alias 'custom-facep #'facep "28.1")
+
 ;;; The End.
 
 (provide 'cus-face)