From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Alan Third Newsgroups: gmane.emacs.bugs Subject: bug#29643: [PATCH] Silence macOS 10.13 deprecation notices (Bug#29643) Date: Sun, 10 Dec 2017 20:27:37 +0000 Message-ID: <20171210202737.GA78649@breton.holly.idiocy.org> References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1512937692 29953 195.159.176.226 (10 Dec 2017 20:28:12 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 10 Dec 2017 20:28:12 +0000 (UTC) User-Agent: Mutt/1.9.1 (2017-09-22) Cc: 29643@debbugs.gnu.org To: Philipp Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Dec 10 21:28:08 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1eO8Cl-0007aZ-7v for geb-bug-gnu-emacs@m.gmane.org; Sun, 10 Dec 2017 21:28:07 +0100 Original-Received: from localhost ([::1]:49650 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eO8Cs-00007X-Iy for geb-bug-gnu-emacs@m.gmane.org; Sun, 10 Dec 2017 15:28:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eO8Cl-00007G-Ac for bug-gnu-emacs@gnu.org; Sun, 10 Dec 2017 15:28:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eO8Cg-0007S9-Sr for bug-gnu-emacs@gnu.org; Sun, 10 Dec 2017 15:28:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:46949) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eO8Cg-0007Rn-N3 for bug-gnu-emacs@gnu.org; Sun, 10 Dec 2017 15:28:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eO8Cg-0007J9-8r for bug-gnu-emacs@gnu.org; Sun, 10 Dec 2017 15:28:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Alan Third Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 10 Dec 2017 20:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 29643 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 29643-submit@debbugs.gnu.org id=B29643.151293766728069 (code B ref 29643); Sun, 10 Dec 2017 20:28:02 +0000 Original-Received: (at 29643) by debbugs.gnu.org; 10 Dec 2017 20:27:47 +0000 Original-Received: from localhost ([127.0.0.1]:55630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eO8CR-0007If-3n for submit@debbugs.gnu.org; Sun, 10 Dec 2017 15:27:47 -0500 Original-Received: from mail-wm0-f46.google.com ([74.125.82.46]:34340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eO8CO-0007IP-Uf for 29643@debbugs.gnu.org; Sun, 10 Dec 2017 15:27:45 -0500 Original-Received: by mail-wm0-f46.google.com with SMTP id y82so10801930wmg.1 for <29643@debbugs.gnu.org>; Sun, 10 Dec 2017 12:27:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=r4RdMIQuquPSlMA3BoCNhQab8djPW5zFSFvmhNmsBXM=; b=fvyLYw6k5xYj7EDl+KcoKDmBi2GJtmYaumBUZJ9XEGE7dUP3mZcRE7Z7zWnCP/e2bW 2l4htyB4L/YPjFv1oJGWXOtraL8IW3JhWj3LNSYM89AU/kjQSmPtKVXkVt4I048xYlIn XaaC8G5MEmoQWKcQXGwJglfAHFXyteklCYn3PPnPbk3CBvRfTN6qF/k7/blL4xkRYF3T LFS0teDVuRNsjSG2X6U/j5xja40dIeaq3gAoaFR7kbjk3WPi/RpD2fjkCpiv6FqEpthH CJzGDgQXp+Gg+j1+VJpU+kesqykkubIoKZYQSmfUl7mCUE3wfDxjU9Po/V5y3axiJrYw F1tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=r4RdMIQuquPSlMA3BoCNhQab8djPW5zFSFvmhNmsBXM=; b=LWs9HzBn/XcpxGH/H9IRO60Gxw52ly1VjjV37r1sslAVWwF7Iy3dZzHiHLpusKZB// ANWfSh3WZd4+IesIwS9+jLrj8KGItlXCF4PaRz9R9eX/r7WwF27UATHiIg249DRl+fMo PfMdXYApXLhPV2xEDya7PH/odYfkvMN04AlVJjjTJXLxF6bnQVN30zg9bLOFdPi+k4Vv 0NI/MB+bsPaibx5sPJP4SvrxUpqQwDYUurX6T0q7+SYj7Fp3B3PUTqvPd8SYvMtwopSJ ZRvX52+4775Pb0/lr3LeAMrHeVhWH3rtOjWXw6Z62l7G62zkioWNqEyMk/zhVTXsUHXJ ZkMw== X-Gm-Message-State: AKGB3mLJu/4ocGxpXVSQr/B22aKpZI40phLZKyaUdnFEyIJO7arhVPjy csITa0mUyQZy7JVyM5wK9TE= X-Google-Smtp-Source: AGs4zMZddksjZlu1rSny+f/3oNsHz9eBMEIB8AYHae2XOBTTivwcpnN6iZX+QfulpS5vlBsXol90zg== X-Received: by 10.28.133.142 with SMTP id h136mr8141686wmd.122.1512937659211; Sun, 10 Dec 2017 12:27:39 -0800 (PST) Original-Received: from breton.holly.idiocy.org (ip6-2001-08b0-03f8-8129-09c7-7705-5027-72ca.holly.idiocy.org. [2001:8b0:3f8:8129:9c7:7705:5027:72ca]) by smtp.gmail.com with ESMTPSA id k30sm15379261wrf.63.2017.12.10.12.27.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 12:27:38 -0800 (PST) Content-Disposition: inline In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:140908 Archived-At: * src/nsfns.m (Fx_display_backing_store): (Fx_display_save_under): Don't use NSBackingStoreRetained or NSBackingStoreNonretained on macOS 10.13+. * src/nsselect.m (symbol_to_nsstring): (ns_string_to_symbol): (nxatoms_of_nsselect): Replace NSGeneralPboard with NSPasteboardNameGeneral. * src/nsterm.h: #define NSPasteboardNameGeneral to NSGeneralPboard on GNUstep and macOS < 10.13. * src/nsterm.m (EmacsView::resetCursorRects): (EmacsScroller::resetCursorRects): Don't use setOnMouseEntered on macOS 10.13+. --- src/nsfns.m | 4 ++++ src/nsselect.m | 8 ++++---- src/nsterm.h | 5 +++++ src/nsterm.m | 17 +++++++++++++++-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/nsfns.m b/src/nsfns.m index 8172268167..064b476fb4 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1896,10 +1896,12 @@ and GNUstep implementations ("distributor-specific release { case NSBackingStoreBuffered: return intern ("buffered"); +#if defined (NS_IMPL_GNUSTEP) || MAC_OS_X_VERSION_MIN_REQUIRED < 101300 case NSBackingStoreRetained: return intern ("retained"); case NSBackingStoreNonretained: return intern ("non-retained"); +#endif default: error ("Strange value for backingType parameter of frame"); } @@ -1953,9 +1955,11 @@ and GNUstep implementations ("distributor-specific release case NSBackingStoreBuffered: return Qt; +#if defined (NS_IMPL_GNUSTEP) || MAC_OS_X_VERSION_MIN_REQUIRED < 101300 case NSBackingStoreRetained: case NSBackingStoreNonretained: return Qnil; +#endif default: error ("Strange value for backingType parameter of frame"); diff --git a/src/nsselect.m b/src/nsselect.m index 067c7788e8..d1ce9437a7 100644 --- a/src/nsselect.m +++ b/src/nsselect.m @@ -36,7 +36,7 @@ Updated by Christian Limpach (chris@nice.ch) static Lisp_Object Vselection_alist; -/* NSGeneralPboard is pretty much analogous to X11 CLIPBOARD */ +/* NSPasteboardNameGeneral is pretty much analogous to X11 CLIPBOARD */ static NSString *NXPrimaryPboard; static NSString *NXSecondaryPboard; @@ -54,7 +54,7 @@ Updated by Christian Limpach (chris@nice.ch) symbol_to_nsstring (Lisp_Object sym) { CHECK_SYMBOL (sym); - if (EQ (sym, QCLIPBOARD)) return NSGeneralPboard; + if (EQ (sym, QCLIPBOARD)) return NSPasteboardNameGeneral; if (EQ (sym, QPRIMARY)) return NXPrimaryPboard; if (EQ (sym, QSECONDARY)) return NXSecondaryPboard; if (EQ (sym, QTEXT)) return NSStringPboardType; @@ -70,7 +70,7 @@ Updated by Christian Limpach (chris@nice.ch) static Lisp_Object ns_string_to_symbol (NSString *t) { - if ([t isEqualToString: NSGeneralPboard]) + if ([t isEqualToString: NSPasteboardNameGeneral]) return QCLIPBOARD; if ([t isEqualToString: NXPrimaryPboard]) return QPRIMARY; @@ -469,7 +469,7 @@ Updated by Christian Limpach (chris@nice.ch) pasteboard_changecount = [[NSMutableDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithLong:0], NSGeneralPboard, + [NSNumber numberWithLong:0], NSPasteboardNameGeneral, [NSNumber numberWithLong:0], NXPrimaryPboard, [NSNumber numberWithLong:0], NXSecondaryPboard, [NSNumber numberWithLong:0], NSStringPboardType, diff --git a/src/nsterm.h b/src/nsterm.h index c81bf5fb63..e669c95931 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -1322,5 +1322,10 @@ enum NSWindowTabbingMode NSWindowTabbingModePreferred, NSWindowTabbingModeDisallowed }; +#endif /* !defined (NS_IMPL_COCOA) || !defined (MAC_OS_X_VERSION_10_12) */ + +#if !defined (NS_IMPL_COCOA) || !defined (MAC_OS_X_VERSION_10_13) +/* Deprecated in macOS 10.13. */ +#define NSPasteboardNameGeneral NSGeneralPboard #endif #endif /* HAVE_NS */ diff --git a/src/nsterm.m b/src/nsterm.m index 50e06c94d4..07ac8f978f 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -6016,7 +6016,13 @@ - (void)resetCursorRects if (!NSIsEmptyRect (visible)) [self addCursorRect: visible cursor: currentCursor]; - [currentCursor setOnMouseEntered: YES]; + +#if defined (NS_IMPL_GNUSTEP) || MAC_OS_X_VERSION_MIN_REQUIRED < 101300 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101300 + if ([currentCursor respondsToSelector: @selector(setOnMouseEntered)]) +#endif + [currentCursor setOnMouseEntered: YES]; +#endif } @@ -8746,7 +8752,14 @@ - (void)resetCursorRects if (!NSIsEmptyRect (visible)) [self addCursorRect: visible cursor: [NSCursor arrowCursor]]; - [[NSCursor arrowCursor] setOnMouseEntered: YES]; + +#if defined (NS_IMPL_GNUSTEP) || MAC_OS_X_VERSION_MIN_REQUIRED < 101300 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101300 + if ([[NSCursor arrowCursor] respondsToSelector: + @selector(setOnMouseEntered)]) +#endif + [[NSCursor arrowCursor] setOnMouseEntered: YES]; +#endif } -- Hi Philipp, can you please check whether this patch silences the deprecation notices? I’m still on 10.12, so I can’t check myself. -- Alan Third