From: Jan Djärv Date: Wed, 2 Oct 2013 18:52:34 +0000 (+0200) Subject: * macfont.m (macfont_draw): Use s->ybase for correct y position. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1409 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c348360a2bdf390fff9883c4c922804a67c9cc9e;p=emacs.git * macfont.m (macfont_draw): Use s->ybase for correct y position. --- diff --git a/src/ChangeLog b/src/ChangeLog index 1bdda53f335..6af5b2ee086 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-10-02 Jan Djärv + + * macfont.m (mac_ctfont_create_preferred_family_for_attributes): Remove + unised variable (from mac-port). + (macfont_draw): Use s->ybase for correct y position. + 2013-10-02 Dmitry Antipov * frame.h (struct frame): Drop has_minibuffer member because... diff --git a/src/macfont.m b/src/macfont.m index cb913991e06..206a810c239 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -2720,7 +2720,7 @@ macfont_draw (struct glyph_string *s, int from, int to, int x, int y, CGFloat font_size = mac_font_get_size (macfont); CGAffineTransform atfm; CGFloat advance_delta = 0; - int y_draw = -y-FONT_BASE (s->font); + int y_draw = -s->ybase; int no_antialias_p = (macfont_info->antialias == MACFONT_ANTIALIAS_OFF || (macfont_info->antialias == MACFONT_ANTIALIAS_DEFAULT @@ -3321,10 +3321,8 @@ mac_ctfont_create_preferred_family_for_attributes (CFDictionaryRef attributes) CFStringRef result = NULL; CFStringRef charset_string = CFDictionaryGetValue (attributes, MAC_FONT_CHARACTER_SET_STRING_ATTRIBUTE); - CFIndex length; - if (charset_string - && (length = CFStringGetLength (charset_string)) > 0) + if (charset_string && CFStringGetLength (charset_string) > 0) { CFAttributedStringRef attr_string = NULL; CTLineRef ctline = NULL;