Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
621e71ee
Commit
621e71ee
authored
Nov 01, 2005
by
Stefan Monnier
Browse files
(face-attribute): Handle the case where a face inherits from
a non-existent face.
parent
1b5fd09e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
lisp/faces.el
lisp/faces.el
+5
-2
No files found.
lisp/faces.el
View file @
621e71ee
...
...
@@ -374,8 +374,11 @@ completely specified)."
;; VALUE is relative, so merge with inherited faces
(let ((inh-from (face-attribute face :inherit frame)))
(unless (or (null inh-from) (eq inh-from 'unspecified))
(setq value
(face-attribute-merged-with attribute value inh-from frame)))))
(condition-case nil
(setq value
(face-attribute-merged-with attribute value inh-from frame))
;; The `inherit' attribute may point to non existent faces.
(error nil)))))
(when (and inherit
(not (eq inherit t))
(face-attribute-relative-p attribute value))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment