[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/font.c,v
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/font.c,v |
Date: |
Thu, 09 Oct 2008 12:12:34 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 08/10/09 12:12:34
Index: font.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/font.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- font.c 1 Oct 2008 17:12:51 -0000 1.85
+++ font.c 9 Oct 2008 12:12:33 -0000 1.86
@@ -2665,11 +2665,13 @@
if (prop < FONT_SPEC_MAX
&& INTEGERP (AREF (spec, FONT_DPI_INDEX))
&& INTEGERP (AREF (entity, FONT_DPI_INDEX))
+ && XINT (AREF (entity, FONT_DPI_INDEX)) != 0
&& ! EQ (AREF (spec, FONT_DPI_INDEX), AREF (entity, FONT_DPI_INDEX)))
prop = FONT_SPEC_MAX;
if (prop < FONT_SPEC_MAX
&& INTEGERP (AREF (spec, FONT_AVGWIDTH_INDEX))
&& INTEGERP (AREF (entity, FONT_AVGWIDTH_INDEX))
+ && XINT (AREF (entity, FONT_AVGWIDTH_INDEX)) != 0
&& ! EQ (AREF (spec, FONT_AVGWIDTH_INDEX),
AREF (entity, FONT_AVGWIDTH_INDEX)))
prop = FONT_SPEC_MAX;
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/10/01
- [Emacs-diffs] Changes to emacs/src/font.c,v, Adrian Robert, 2008/10/01
- [Emacs-diffs] Changes to emacs/src/font.c,v,
Kenichi Handa <=
- [Emacs-diffs] Changes to emacs/src/font.c,v, Andreas Schwab, 2008/10/12
- [Emacs-diffs] Changes to emacs/src/font.c,v, Chong Yidong, 2008/10/14
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/10/23
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/10/23
- [Emacs-diffs] Changes to emacs/src/font.c,v, Kenichi Handa, 2008/10/23