[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 22d8112 1/4: Mark compat alias in cus-face.el obsolete
From: |
Stefan Kangas |
Subject: |
master 22d8112 1/4: Mark compat alias in cus-face.el obsolete |
Date: |
Fri, 20 Nov 2020 10:12:51 -0500 (EST) |
branch: master
commit 22d81123f5d552d516fb9461f90ad196af9c91a8
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
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.
---
lisp/cus-dep.el | 2 +-
lisp/cus-edit.el | 10 +++++-----
lisp/cus-face.el | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 9003b7f..db2c444 100644
--- 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 b46be39..eceba8f 100644
--- 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 cc766aa..199a76e 100644
--- 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)