progmodes/cc-fonts.el (c-font-lock-declarators): Remove check for

[gnu-emacs] / src / nsfont.m

diff --git a/src/nsfont.m b/src/nsfont.m
index 2c5e25b993c2ac4c4998709dd8f3d8f7feabe4b9..98c25fcdedd07191457778a05f357db3df1f04ce 100644 (file)
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -649,7 +649,7 @@ struct font_driver nsfont_driver =
     nsfont_encode_char,
     nsfont_text_extents,
     nsfont_draw,
-    /* excluded: get_bitmap, free_bitmap, get_outline, free_outline,
+    /* excluded: get_bitmap, free_bitmap,
                  anchor_point, otf_capability, otf_driver,
                 start_for_frame, end_for_frame, shape */
   };
@@ -830,9 +830,6 @@ nsfont_open (struct frame *f, Lisp_Object font_entity, int pixel_size)
   font->baseline_offset = 0;
   font->relative_compose = 0;
 
-  font->props[FONT_FORMAT_INDEX] = Qns;
-  font->props[FONT_FILE_INDEX] = Qnil;
-
   {
     const char *fontName = [[nsfont fontName] UTF8String];
 
@@ -945,6 +942,8 @@ nsfont_close (struct font *font)
          xfree (font_info->glyphs[i]);
          xfree (font_info->metrics[i]);
        }
+      xfree (font_info->glyphs);
+      xfree (font_info->metrics);
       [font_info->nsfont release];
 #ifdef NS_IMPL_COCOA
       CGFontRelease (font_info->cgfont);