Mercurial > emacs
comparison src/macterm.c @ 83544:58cf725f5330
Merged from emacs@sv.gnu.org.
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-474
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-475
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-476
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-477
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-478
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-150
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-151
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-152
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-584
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sun, 03 Dec 2006 12:15:03 +0000 |
parents | 2d56e13fd23d bd82ccfce877 |
children | c71725faff1a |
comparison
equal
deleted
inserted
replaced
83543:6b25ef5cc276 | 83544:58cf725f5330 |
---|---|
1196 kATSUToTextEnd, NULL, NULL, NULL); | 1196 kATSUToTextEnd, NULL, NULL, NULL); |
1197 if (err1 == noErr) | 1197 if (err1 == noErr) |
1198 err1 = ATSUGetGlyphInfo (text_layout, kATSUFromTextBeginning, | 1198 err1 = ATSUGetGlyphInfo (text_layout, kATSUFromTextBeginning, |
1199 kATSUToTextEnd, &count, | 1199 kATSUToTextEnd, &count, |
1200 &glyph_info_array); | 1200 &glyph_info_array); |
1201 if (err1 == noErr) | 1201 if (err1 == noErr |
1202 /* Make sure that we don't have to make layout | |
1203 adjustments. */ | |
1204 && glyph_info_array.glyphs[0].deltaY == 0.0f | |
1205 && glyph_info_array.glyphs[0].idealX == 0.0f | |
1206 && glyph_info_array.glyphs[0].screenX == 0) | |
1202 { | 1207 { |
1203 xassert (glyph_info_array.glyphs[0].glyphID); | 1208 xassert (glyph_info_array.glyphs[0].glyphID); |
1204 *cg_glyph = glyph_info_array.glyphs[0].glyphID; | 1209 *cg_glyph = glyph_info_array.glyphs[0].glyphID; |
1205 } | 1210 } |
1206 else | 1211 else |
7961 : NULL) | 7966 : NULL) |
7962 #else | 7967 #else |
7963 NULL | 7968 NULL |
7964 #endif | 7969 #endif |
7965 ); | 7970 ); |
7966 if (err != noErr) | 7971 if (err != noErr |
7972 || space_bounds->width <= 0 || FONT_HEIGHT (font) <= 0) | |
7967 { | 7973 { |
7968 mac_unload_font (&one_mac_display_info, font); | 7974 mac_unload_font (&one_mac_display_info, font); |
7969 return NULL; | 7975 return NULL; |
7970 } | 7976 } |
7971 | 7977 |