From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Philipp Stephani Newsgroups: gmane.emacs.devel Subject: [PATCH 06/13] Remove calls to deprecated setUsesScreenFonts Date: Sat, 20 May 2017 16:58:34 +0200 Message-ID: <20170520145841.94282-6-phst@google.com> References: <20170520145841.94282-1-phst@google.com> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1495292519 15505 195.159.176.226 (20 May 2017 15:01:59 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 20 May 2017 15:01:59 +0000 (UTC) Cc: Philipp Stephani To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 20 17:01:56 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dC5tD-0003we-3X for ged-emacs-devel@m.gmane.org; Sat, 20 May 2017 17:01:55 +0200 Original-Received: from localhost ([::1]:34523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dC5tI-0001RP-JF for ged-emacs-devel@m.gmane.org; Sat, 20 May 2017 11:02:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dC5qh-0007qP-2Y for emacs-devel@gnu.org; Sat, 20 May 2017 10:59:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dC5qg-0003GW-B0 for emacs-devel@gnu.org; Sat, 20 May 2017 10:59:19 -0400 Original-Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:34172) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dC5qg-0003GB-4U for emacs-devel@gnu.org; Sat, 20 May 2017 10:59:18 -0400 Original-Received: by mail-wm0-x241.google.com with SMTP id d127so23290922wmf.1 for ; Sat, 20 May 2017 07:59:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RF9zbsPtHt3/ISc7YK8sE4vQdk/spfVoZ9ClTco01zE=; b=bnbfHnoNjr2cMkyWh7Dz+0rTI1Ufkj4vIM8fLPsEgqU/NZUz6MrcEZ8EIR5vkXrmVn KQl0PFHIS3uONKysmnxuKmgqDA4ec5hO9b02SbpXFe3Zr4u8pjZxrG6apal91jYcl4cS G6apFr78QAXQiGnyGKkEklAK+dXPgupQD2Of7yIa4gYTCKPoeZzdEzcp7rPkayfRC1az P+s84rQ682vkujybxpFtkeoirMnFw4tXr8M8q1BK53U9JpJLrsdd50307lTqx0zrx8Tp M1scREtzDT7YN47jxjhAUlMVes1t1Dvx/qAMwAMsV+IbdsvwCYIwEVIbrBEZsWFsrL+s 0H+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RF9zbsPtHt3/ISc7YK8sE4vQdk/spfVoZ9ClTco01zE=; b=Hpy8LJbYclLcsX4lEbktf04cAnLBMsnLCfKjp+TkI4GKGWalWbfmN8m7l+EjlPTYEN 4SAR/7CslYoP31pRlCt+wFoxN0zY0OhK/XM79qIunL6QRg1FXPXKVgo8YxW+yI7rwa5g 1kWFOjR7D+siaSkwZzwN7oLVfS/khvm6grwERvCXPUbzk4d3W2ikQILFbf7J9kXPvNgR CfnG5476oqh9NZLAMeIwfs5r5EVEQhIBJBZjbrRDvVNpNIhDQj8ZuHI5XGfFR9IqGRot S6Kc7BRmRjklYVZuuXf7iM2AgbTn14UP31UFv8TrQXDagEi1akvUF19e/wHzhGsXdXX4 STMQ== X-Gm-Message-State: AODbwcABRXHuRVoy2Z9DBtGLdwz6ybmibbO3dXiSCpzJvGze8P39NP5e fgKB4uriTMIE6w== X-Received: by 10.28.66.2 with SMTP id p2mr23084319wma.20.1495292357016; Sat, 20 May 2017 07:59:17 -0700 (PDT) Original-Received: from p.cm.cablesurf.de (46.128.198.151.dynamic.cablesurf.de. [46.128.198.151]) by smtp.gmail.com with ESMTPSA id 4sm7795937wrv.33.2017.05.20.07.59.16 (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 20 May 2017 07:59:16 -0700 (PDT) X-Google-Original-From: Philipp Stephani X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170520145841.94282-1-phst@google.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:215019 Archived-At: * src/macfont.m (mac_screen_font_get_metrics): Don't call setUsesScreenFonts. (mac_font_shape_1): Remove screen_font_p parameter. (mac_screen_font_shape): Remove screen_font_p argument. --- src/macfont.m | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/macfont.m b/src/macfont.m index b859eb4378..dccb4e6fd0 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -284,7 +284,6 @@ static void mac_font_get_glyphs_for_variants (CFDataRef, UTF32Char, [textStorage setFont:nsFont]; [textContainer setLineFragmentPadding:0]; - [layoutManager setUsesScreenFonts:YES]; [layoutManager addTextContainer:textContainer]; [textContainer release]; @@ -318,8 +317,7 @@ static void mac_font_get_glyphs_for_variants (CFDataRef, UTF32Char, static CFIndex mac_font_shape_1 (NSFont *font, NSString *string, - struct mac_glyph_layout *glyph_layouts, CFIndex glyph_len, - BOOL screen_font_p) + struct mac_glyph_layout *glyph_layouts, CFIndex glyph_len) { NSUInteger i; CFIndex result = 0; @@ -339,7 +337,6 @@ static void mac_font_get_glyphs_for_variants (CFDataRef, UTF32Char, initWithString:@" "] autorelease])]; [textStorage setFont:font]; [textContainer setLineFragmentPadding:0]; - [layoutManager setUsesScreenFonts:screen_font_p]; [layoutManager addTextContainer:textContainer]; [textContainer release]; @@ -587,7 +584,7 @@ static void mac_font_get_glyphs_for_variants (CFDataRef, UTF32Char, { return mac_font_shape_1 ([(NSFont *)font printerFont], (NSString *) string, - glyph_layouts, glyph_len, YES); + glyph_layouts, glyph_len); } static CGColorRef -- 2.13.0