Blame emacs-23.2-spacing.patch
|
Karel Klíč |
c094eb |
diff --git a/src/ftfont.c b/src/ftfont.c
|
|
Karel Klíč |
c094eb |
index 4ebc4be..bac9a4f 100644
|
|
Karel Klíč |
c094eb |
--- a/src/ftfont.c
|
|
Karel Klíč |
c094eb |
+++ b/src/ftfont.c
|
|
Karel Klíč |
c094eb |
@@ -1262,7 +1262,7 @@ ftfont_open (f, entity, pixel_size)
|
|
Karel Klíč |
c094eb |
spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
|
|
Karel Klíč |
c094eb |
else
|
|
Karel Klíč |
c094eb |
spacing = FC_PROPORTIONAL;
|
|
Karel Klíč |
c094eb |
- if (spacing != FC_PROPORTIONAL)
|
|
Karel Klíč |
c094eb |
+ if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
|
|
Karel Klíč |
c094eb |
font->min_width = font->average_width = font->space_width
|
|
Karel Klíč |
c094eb |
= (scalable ? ft_face->max_advance_width * size / upEM
|
|
Karel Klíč |
c094eb |
: ft_face->size->metrics.max_advance >> 6);
|
|
Karel Klíč |
c094eb |
diff --git a/src/xftfont.c b/src/xftfont.c
|
|
Karel Klíč |
c094eb |
index 82701ce..e74ce31 100644
|
|
Karel Klíč |
c094eb |
--- a/src/xftfont.c
|
|
Karel Klíč |
c094eb |
+++ b/src/xftfont.c
|
|
Karel Klíč |
c094eb |
@@ -418,7 +418,7 @@ xftfont_open (f, entity, pixel_size)
|
|
Karel Klíč |
c094eb |
ascii_printable[i] = ' ' + i;
|
|
Karel Klíč |
c094eb |
}
|
|
Karel Klíč |
c094eb |
BLOCK_INPUT;
|
|
Karel Klíč |
c094eb |
- if (spacing != FC_PROPORTIONAL)
|
|
Karel Klíč |
c094eb |
+ if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
|
|
Karel Klíč |
c094eb |
{
|
|
Karel Klíč |
c094eb |
font->min_width = font->average_width = font->space_width
|
|
Karel Klíč |
c094eb |
= xftfont->max_advance_width;
|