[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r116948: Deprecate optional argument of make-face
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-24 r116948: Deprecate optional argument of make-face. |
Date: |
Sat, 12 Apr 2014 14:23:31 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116948
revision-id: address@hidden
parent: address@hidden
author: Matthias Dahl <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-04-12 17:22:55 +0300
message:
Deprecate optional argument of make-face.
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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/faces.el faces.el-20091113204419-o5vbwnq5f7feedwu-562
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-04-12 08:49:05 +0000
+++ b/lisp/ChangeLog 2014-04-12 14:22:55 +0000
@@ -1,3 +1,10 @@
+2014-04-12 Matthias Dahl <address@hidden>
+
+ * 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 <address@hidden>
* international/characters.el <standard-case-table>: Add entries
=== modified file 'lisp/faces.el'
--- a/lisp/faces.el 2014-04-05 07:44:56 +0000
+++ b/lisp/faces.el 2014-04-12 14:22:55 +0000
@@ -133,9 +133,11 @@
"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 @@
(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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r116948: Deprecate optional argument of make-face.,
Eli Zaretskii <=