[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src xfaces.c
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/src xfaces.c |
Date: |
Tue, 13 Jan 2009 20:03:08 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/01/13 20:03:08
Modified files:
src : xfaces.c
Log message:
(Finternal_set_lisp_face_attribute): Revert last change.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfaces.c?cvsroot=emacs&r1=1.428&r2=1.429
Patches:
Index: xfaces.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfaces.c,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -b -r1.428 -r1.429
--- xfaces.c 12 Jan 2009 02:32:08 -0000 1.428
+++ xfaces.c 13 Jan 2009 20:03:08 -0000 1.429
@@ -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