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 08/13] Nextstep: remove some deprecated method calls Date: Sat, 20 May 2017 16:58:36 +0200 Message-ID: <20170520145841.94282-8-phst@google.com> References: <20170520145841.94282-1-phst@google.com> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1495292643 24981 195.159.176.226 (20 May 2017 15:04:03 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 20 May 2017 15:04:03 +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:04:00 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 1dC5vD-0006Oy-MM for ged-emacs-devel@m.gmane.org; Sat, 20 May 2017 17:03:59 +0200 Original-Received: from localhost ([::1]:34532 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dC5vJ-00033L-Bw for ged-emacs-devel@m.gmane.org; Sat, 20 May 2017 11:04:05 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dC5qj-0007rz-7r for emacs-devel@gnu.org; Sat, 20 May 2017 10:59:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dC5qi-0003Hf-Fh for emacs-devel@gnu.org; Sat, 20 May 2017 10:59:21 -0400 Original-Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:33284) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dC5qi-0003HQ-9G for emacs-devel@gnu.org; Sat, 20 May 2017 10:59:20 -0400 Original-Received: by mail-wm0-x244.google.com with SMTP id b84so7459464wmh.0 for ; Sat, 20 May 2017 07:59:20 -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=9r9JVwvAxJYVFqzGMHCICmsuhNGi7qTDsCHp+h7gfGY=; b=lVA6uM5AvoqdcVhpTgFUQU+RVAxjnPzCOpqg2Iujq0/cJktDssKPzvlI0GLkD/R5++ BoEnvZv+1+YCORsAY9SAadVp2dHyqEx0LPw+0CzRLBLTyLEEPbuAEDdlO0yc6DwK0ack cjBsKmjvl5i2/cfjhwRWli+PAzCTVl5hc8pAU3KxMecjjOh2xWZr8DMyVHP3qZWvio2z XO5MeiJqN8hQLI7lqbpymCvWprnAK/OS58iVdw2OjynfaYS+jGglwgLd4Ml5BZNKZ6Tz gSsbIGjE+otfWU0CTcKsJCAMcrE0VnQpsGYhuAyIOm2omGPUo0rWDNKTpf1UOX/BzsHw LWeQ== 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=9r9JVwvAxJYVFqzGMHCICmsuhNGi7qTDsCHp+h7gfGY=; b=QOHFwtd5bClHKTyWrEHvGtjlsk2Xh40+/D8ye4d9zhkJQ5jt9yABX1QMk41c0idFHr 5Flci2uPJBZ3WtBFEbTcHhQenzxM/tqS8CyAZinEUw3bPrxXLSq/XuedUeBqYa7HvoQI z+LlU/ArLGYOHmDTgnCv6sXDIPrMLcnTJq2Pw+IzqZcMKSLSDJj/JPAMA1xKserJhTZo QvYVF9aoxU0FLWZEih/wHLaUzJt32baQS46IICpfcuZZyFfNGilWA/KO+Dhcvg3cZNHT yQCeVMD/CaGskfnvfoEnlv7+XJlUI9yIQ8CYPGS3fAChZcLA+zsWLXsbSg9erRfFnSQ2 eklA== X-Gm-Message-State: AODbwcDkdJZB+abYFY27i2LPR9TFOVkej6uWReZMbkf4atpaQXotulb/ FSQmbMoN1bEtwtJvkAY= X-Received: by 10.28.103.3 with SMTP id b3mr8636970wmc.5.1495292358903; Sat, 20 May 2017 07:59:18 -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.17 (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 20 May 2017 07:59:18 -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::244 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:215022 Archived-At: * src/nsterm.m (mouseDown:): * src/nsmenu.m (runMenuAt:forFrame:keymaps:): Remove call to deprecated method. The return value is always nil. * src/macfont.m (mac_font_shape_1): Replace call to deprecated method. --- src/macfont.m | 5 +++-- src/nsmenu.m | 2 +- src/nsterm.m | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/macfont.m b/src/macfont.m index dccb4e6fd0..be8153390d 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -410,8 +410,9 @@ static void mac_font_get_glyphs_for_variants (CFDataRef, UTF32Char, /* For now we assume the direction is not changed within the string. */ [layoutManager getGlyphsInRange:(NSMakeRange (glyphIndex, 1)) - glyphs:NULL characterIndexes:NULL - glyphInscriptions:NULL elasticBits:NULL + glyphs:NULL + properties:NULL + characterIndexes:NULL bidiLevels:&bidiLevel]; if (bidiLevel & 1) permutation = xmalloc (sizeof (NSUInteger) * used); diff --git a/src/nsmenu.m b/src/nsmenu.m index 5e863bb17d..8dcbe194d5 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -750,7 +750,7 @@ - (Lisp_Object)runMenuAt: (NSPoint)p forFrame: (struct frame *)f modifierFlags: 0 timestamp: [e timestamp] windowNumber: [[view window] windowNumber] - context: [e context] + context: nil eventNumber: 0/*[e eventNumber] */ clickCount: 1 pressure: 0]; diff --git a/src/nsterm.m b/src/nsterm.m index 9ba1dc0fa2..a734d0f86e 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -8602,7 +8602,7 @@ - (void)mouseDown: (NSEvent *)e modifierFlags: [e modifierFlags] timestamp: [e timestamp] windowNumber: [e windowNumber] - context: [e context] + context: nil eventNumber: [e eventNumber] clickCount: [e clickCount] pressure: [e pressure]]; -- 2.13.0