Mercurial > emacs
changeset 101157:09733f004f60
(Finternal_set_lisp_face_attribute): Revert last change.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 13 Jan 2009 20:03:08 +0000 |
| parents | fe4728c4a48b |
| children | 4a6ff510dcf9 |
| files | src/xfaces.c |
| diffstat | 1 files changed, 0 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfaces.c Tue Jan 13 20:02:59 2009 +0000 +++ b/src/xfaces.c Tue Jan 13 20:03:08 2009 +0000 @@ -2469,11 +2469,6 @@ } } - /* If `font' attribute is specified, reflect the font properties in - it to the other attributes. */ - if (0 && !UNSPECIFIEDP (to[LFACE_FONT_INDEX])) - font_update_lface (f, to); - /* TO is always an absolute face, which should inherit from nothing. We blindly copy the :inherit attribute above and fix it up here. */ to[LFACE_INHERIT_INDEX] = Qnil; @@ -3341,12 +3336,6 @@ the attribute is mandatory. Also, clear the average width. */ font_clear_prop (XVECTOR (lface)->contents, prop_index); - - /* If we are setting QCfamily, clear out FONT_WIDTH_INDEX as - well. This avoids rejecting valid families that lack support - for a particular width. */ - if (prop_index == FONT_FAMILY_INDEX) - font_clear_prop (XVECTOR (lface)->contents, FONT_WIDTH_INDEX); } /* Changing a named face means that all realized faces depending on