Fixed merge

Author: splhack

src/MacVim/MMCoreTextView.m

@@ -1252,7 +1252,7 @@ - (void)drawString:(const UniChar *)chars length:(UniCharCount)length
 
     CGContextSetTextPosition(context, x, y+fontDescent);
     recurseDraw(chars, glyphs, positions, length, context, fontRef, fontCache,
-                fontCache, (flags & DRAW_WIDE) && emojiEnabled);
+                (flags & DRAW_WIDE) && emojiEnabled);
 
     CFRelease(fontRef);
     CGContextRestoreGState(context);