>From c8848a3c73f3773bdfcc35d177b0ec0421cfbdfa Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 9 Apr 2014 11:35:22 +0200 Subject: [PATCH] lisp/faces.el: Remove deprecated optional argument of make-face The conditional application of X resources is handled directly by make-face-x-resource-internal since Emacs 24.4 and thus hasn't been evaluated since. Fix make-empty-face to not pass an optional argument to make-face. --- lisp/ChangeLog | 7 +++++++ lisp/faces.el | 11 ++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5b8e0e9..f926d30 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-04-07 Matthias Dahl + + * 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-09 Daniel Colascione * emacs-lisp/cl-indent.el: Add comment claiming diff --git a/lisp/faces.el b/lisp/faces.el index b2f353d..c2ef62f 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -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. -- 1.9.1