mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-22 07:09:54 +00:00
Code Issues Releases Activity

(custom-face-attributes):

Browse Source 
Add support for :inherit attribute.
  Add support for relative face heights.
(custom-face-attributes-get):
  Treat `nil' as being a default value for :inherit (as well as `unspecified').
This commit is contained in:
Miles Bader 2000-08-26 11:47:02 +00:00
parent 19feb949ce
commit 6bca30057a
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lisp/cus-face.el
View File

@ -109,13 +109,14 @@
(choice :tag "Height"
:help-echo "Face's font height."
(const :tag "*" nil)
(integer :tag "Height in 1/10 pt"))
(integer :tag "Height in 1/10 pt")
(number :tag "Scale" 1.0))
(lambda (face value &optional frame)
(set-face-attribute face frame :height (or value 'unspecified)))
(lambda (face &optional frame)
(let ((height (face-attribute face :height frame)))
(if (eq height 'unspecified) nil height))))
(:weight
(choice :tag "Weight"
:help-echo "Font weight."
@ -278,7 +279,26 @@
(set-face-attribute face frame :stipple (or value 'unspecified)))
(lambda (face &optional frame)
(let ((value (face-attribute face :stipple frame)))
(if (eq value 'unspecified) nil value)))))
(if (eq value 'unspecified) nil value))))
(:inherit
(repeat :tag "Inherit"
:help-echo "List of faces to inherit attributes from."
(face :Tag "Face" default))
(lambda (face value &optional frame)
(message "Setting to: <%s>" value)
(set-face-attribute face frame :inherit
(if (and (consp value) (null (cdr value)))
(car value)
value)))
(lambda (face &optional frame)
(let ((value (face-attribute face :inherit frame)))
(cond ((or (null value) (eq value 'unspecified))
nil)
((symbolp value)
(list value))
(t
value))))))
"Alist of face attributes.
@ -307,7 +327,8 @@ If FRAME is nil, use the global defaults for FACE."
(let* ((attribute (car (car attrs)))
(value (face-attribute face attribute frame)))
(setq attrs (cdr attrs))
(unless (eq value 'unspecified)
(unless (or (eq value 'unspecified)
(and (null value) (memq attribute '(:inherit))))
(setq plist (cons attribute (cons value plist))))))
plist))