[Emacs-diffs] trunk r114501: * macfont.m (macfont_draw): Use s->ybase for correct y position.

[Jan D.]

------------------------------------------------------------
revno: 114501
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-02 20:52:34 +0200
message:
  * macfont.m (macfont_draw): Use s->ybase for correct y position.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/macfont.m                  macfont.m-20130915173740-04lgloz0557bz98l-2

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-02 15:38:12 +0000
+++ b/src/ChangeLog     2013-10-02 18:52:34 +0000
@@ -1,3 +1,9 @@
+2013-10-02  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        * frame.h (struct frame): Drop has_minibuffer member because...

=== modified file 'src/macfont.m'
--- a/src/macfont.m     2013-10-02 03:26:29 +0000
+++ b/src/macfont.m     2013-10-02 18:52:34 +0000
@@ -2720,7 +2720,7 @@
       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 @@
   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;