Merge pull request #703 from Giemsa/fix/invalid_font_on_high_sierra

Fix: failed to select some fonts on high sierra

Author: splhack

src/MacVim/MMCoreTextView.m

@@ -294,11 +294,7 @@ - (void)setFont:(NSFont *)newFont
     double em = round(defaultAdvanceForFont(newFont));
     double pt = round([newFont pointSize]);
 
-    NSDictionary *attr = [NSDictionary dictionaryWithObjectsAndKeys:
-        [newFont displayName], (NSString*)kCTFontNameAttribute,
-        [NSNumber numberWithFloat:pt], (NSString*)kCTFontSizeAttribute, nil];
-    CTFontDescriptorRef desc = CTFontDescriptorCreateWithAttributes(
-            (CFDictionaryRef)attr);
+    CTFontDescriptorRef desc = CTFontDescriptorCreateWithNameAndSize((CFStringRef)[newFont fontName], pt);
     CTFontRef fontRef = CTFontCreateWithFontDescriptor(desc, pt, NULL);
     CFRelease(desc);
 
@@ -787,7 +783,7 @@ - (void)changeFont:(id)sender
     NSFont *newFont = [sender convertFont:font];
 
     if (newFont) {
-        NSString *name = [newFont displayName];
+        NSString *name = [newFont fontName];
         unsigned len = [name lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
         if (len > 0) {
             NSMutableData *data = [NSMutableData data];