[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfaces.c,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfaces.c,v |
Date: |
Tue, 14 Oct 2008 04:08:09 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/10/14 04:08:09
Index: xfaces.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfaces.c,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -b -r1.414 -r1.415
--- xfaces.c 1 Sep 2008 19:46:16 -0000 1.414
+++ xfaces.c 14 Oct 2008 04:08:08 -0000 1.415
@@ -3356,12 +3356,16 @@
signal_error ("Invalid face attribute name", attr);
if (prop_index)
- /* If a font-related attribute other than QCfont and QCfontset is
- specified, and if the original QCfont attribute has a font
+ {
+ /* If a font-related attribute other than QCfont and QCfontset
+ is specified, and if the original QCfont attribute has a font
(font-spec or font-object), set the corresponding property in
the font to nil so that the font selector doesn't think that
- the attribute is mandatory. */
+ the attribute is mandatory. Also, clear the average
+ width. */
font_clear_prop (XVECTOR (lface)->contents, prop_index);
+ font_clear_prop (XVECTOR (lface)->contents, FONT_AVGWIDTH_INDEX);
+ }
/* Changing a named face means that all realized faces depending on
that face are invalid. Since we cannot tell which realized faces
- [Emacs-diffs] Changes to emacs/src/xfaces.c,v,
Chong Yidong <=