Commit 7f0f4c25 authored by Matthias Dahl's avatar Matthias Dahl Committed by Eli Zaretskii
Browse files

Remove deprecated optional argument of make-face.

 lisp/faces.el (make-face): Remove deprecated optional argument. The
 conditional application of X resources is handled directly by
 make-face-x-resource-internal since Emacs 24.4.
 (make-empty-face): Don't pass optional argument to make-face.
parent e088b01d
2014-04-12 Matthias Dahl <matthias.dahl@binary-island.eu>
* faces.el (make-face): Remove deprecated optional argument. The
conditional application of X resources is handled directly by
make-face-x-resource-internal since Emacs 24.4.
(make-empty-face): Don't pass optional argument to make-face.
2014-04-11 Glenn Morris <rgm@gnu.org>
 
* Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport. (Bug#16429)
......
......@@ -149,13 +149,11 @@ REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc."
"Return a list of all defined faces."
(mapcar #'car face-new-frame-defaults))
(defun make-face (face &optional no-init-from-resources)
(defun make-face (face)
"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."
(interactive (list (read-from-minibuffer
"Make face: " nil nil t 'face-name-history)))
(unless (facep face)
......@@ -166,8 +164,7 @@ 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)
(defun make-empty-face (face)
......@@ -175,7 +172,7 @@ leave it unmodified. Return 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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment