procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Deprecate optional argument of make-face.

Browse source 
lisp/faces.el (make-face): Deprecate optional argument as it is no
 longer needed/used since the conditional X resources handling
 has been pushed down to make-face-x-resource-internal itself.
 (make-empty-face): Don't pass optional argument to make-face.
This commit is contained in:
Matthias Dahl 2014-04-12 17:22:55 +03:00 • committed by Eli Zaretskii
parent 180c8ce0c6
commit 5f91455c9d
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2014-04-12 Matthias Dahl <matthias.dahl@binary-island.eu>
* faces.el (make-face): Deprecate optional argument as it is no
longer needed/used since the conditional X resources handling
has been pushed down to make-face-x-resource-internal itself.
(make-empty-face): Don't pass optional argument to make-face.
2014-04-12 Eli Zaretskii <eliz@gnu.org>
* international/characters.el <standard-case-table>: Add entries

18
lisp/faces.el
View file

@ -133,9 +133,11 @@ REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc."
"Define a new face with name FACE, a symbol.
Do not call this directly from Lisp code; use `defface' instead.
If NO-INIT-FROM-RESOURCES is non-nil, don't initialize face
attributes from X resources. If FACE is already known as a face,
leave it unmodified. Return FACE."
If FACE is already known as a face, leave it unmodified. Return FACE.
NO-INIT-FROM-RESOURCES has been deprecated and is no longer used
and will go away. Handling of conditional X resources application
has been pushed down to make-x-resource-internal itself."
(interactive (list (read-from-minibuffer
"Make face: " nil nil t 'face-name-history)))
(unless (facep face)
@ -146,16 +148,20 @@ leave it unmodified. Return FACE."
(when (fboundp 'facemenu-add-new-face)
(facemenu-add-new-face face))
;; Define frame-local faces for all frames from X resources.
(unless no-init-from-resources
(make-face-x-resource-internal face)))
(make-face-x-resource-internal face))
face)
;; Handling of whether to apply X resources or not, has been pushed down
;; to make-face-x-resource-internal itself, thus the optional arg is no
;; longer evaluated at all and going away.
(set-advertised-calling-convention 'make-face '(face) "24.4")
(defun make-empty-face (face)
"Define a new, empty face with name FACE.
Do not call this directly from Lisp code; use `defface' instead."
(interactive (list (read-from-minibuffer
"Make empty face: " nil nil t 'face-name-history)))
(make-face face 'no-init-from-resources))
(make-face face))
(defun copy-face (old-face new-face &optional frame new-frame)
"Define a face named NEW-FACE, which is a copy of OLD-FACE.