[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog xfaces.c [EMACS_23_1_RC]
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/src ChangeLog xfaces.c [EMACS_23_1_RC] |
Date: |
Tue, 28 Jul 2009 15:00:56 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_23_1_RC
Changes by: Chong Yidong <cyd> 09/07/28 15:00:55
Modified files:
src : ChangeLog xfaces.c
Log message:
* xfaces.c (face_with_height): Call font_clear_prop.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.7586.2.35&r2=1.7586.2.36
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfaces.c?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.436&r2=1.436.2.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7586.2.35
retrieving revision 1.7586.2.36
diff -u -b -r1.7586.2.35 -r1.7586.2.36
--- ChangeLog 28 Jul 2009 02:05:41 -0000 1.7586.2.35
+++ ChangeLog 28 Jul 2009 15:00:51 -0000 1.7586.2.36
@@ -1,5 +1,9 @@
2009-07-28 Kenichi Handa <address@hidden>
+ * xfaces.c (face_with_height): Call font_clear_prop.
+
+2009-07-28 Kenichi Handa <address@hidden>
+
* font.c (font_parse_xlfd): Check DPI and AVGWIDTH properties more
rigidly.
Index: xfaces.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfaces.c,v
retrieving revision 1.436
retrieving revision 1.436.2.1
diff -u -b -r1.436 -r1.436.2.1
--- xfaces.c 9 Jun 2009 05:57:37 -0000 1.436
+++ xfaces.c 28 Jul 2009 15:00:54 -0000 1.436.2.1
@@ -4959,6 +4959,7 @@
face = FACE_FROM_ID (f, face_id);
bcopy (face->lface, attrs, sizeof attrs);
attrs[LFACE_HEIGHT_INDEX] = make_number (height);
+ font_clear_prop (attrs, FONT_SIZE_INDEX);
face_id = lookup_face (f, attrs);
#endif /* HAVE_WINDOW_SYSTEM */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src ChangeLog xfaces.c [EMACS_23_1_RC],
Chong Yidong <=