[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100442: Use FC_DUAL only when it
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100442: Use FC_DUAL only when it is defined. |
Date: |
Wed, 02 Feb 2011 11:17:33 +0900 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100442 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: emacs-23
timestamp: Wed 2011-02-02 11:17:33 +0900
message:
Use FC_DUAL only when it is defined.
modified:
src/ChangeLog
src/ftfont.c
src/xftfont.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-01 19:01:25 +0000
+++ b/src/ChangeLog 2011-02-02 02:16:53 +0000
@@ -1,3 +1,9 @@
+2011-02-02 Kenichi Handa <address@hidden>
+
+ * ftfont.c (ftfont_open): Use FC_DUAL only when it is defined.
+
+ * xftfont.c (xftfont_open): Likewise.
+
2011-02-01 Andreas Schwab <address@hidden>
* window.c (Fselect_window): Add missing return value.
=== modified file 'src/ftfont.c'
--- a/src/ftfont.c 2011-01-02 23:50:46 +0000
+++ b/src/ftfont.c 2011-02-02 02:15:29 +0000
@@ -1262,7 +1262,11 @@
spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
else
spacing = FC_PROPORTIONAL;
- if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
+ if (spacing != FC_PROPORTIONAL
+#ifdef FC_DUAL
+ && spacing != FC_DUAL
+#endif /* FC_DUAL */
+ )
font->min_width = font->average_width = font->space_width
= (scalable ? ft_face->max_advance_width * size / upEM
: ft_face->size->metrics.max_advance >> 6);
=== modified file 'src/xftfont.c'
--- a/src/xftfont.c 2011-01-02 23:50:46 +0000
+++ b/src/xftfont.c 2011-02-02 02:15:29 +0000
@@ -430,7 +430,11 @@
ascii_printable[i] = ' ' + i;
}
BLOCK_INPUT;
- if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
+ if (spacing != FC_PROPORTIONAL
+#ifdef FC_DUAL
+ && spacing != FC_DUAL
+#endif /* FC_DUAL */
+ )
{
font->min_width = font->average_width = font->space_width
= xftfont->max_advance_width;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r100442: Use FC_DUAL only when it is defined.,
Kenichi Handa <=