From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Third Newsgroups: gmane.emacs.bugs Subject: bug#23924: [PATCH] Only check for AppDefined events in OS X 10.10 (bug#23924) Date: Wed, 13 Jul 2016 22:03:45 +0100 Message-ID: <20160713210345.GA89533@breton.holly.idiocy.org> References: <39AC2AF3-C87A-4743-803D-155A9E35081A@play-bow.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1468444784 16436 80.91.229.3 (13 Jul 2016 21:19:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 Jul 2016 21:19:44 +0000 (UTC) Cc: 23924@debbugs.gnu.org To: Bob Halley Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jul 13 23:19:35 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bNRZ7-0001sP-37 for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 Jul 2016 23:19:33 +0200 Original-Received: from localhost ([::1]:50005 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNRZ1-0004ZW-DJ for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 Jul 2016 17:19:27 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58866) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNRKA-0003lS-BB for bug-gnu-emacs@gnu.org; Wed, 13 Jul 2016 17:04:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNRK5-0001wZ-U1 for bug-gnu-emacs@gnu.org; Wed, 13 Jul 2016 17:04:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:37879) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNRK5-0001wS-Qr for bug-gnu-emacs@gnu.org; Wed, 13 Jul 2016 17:04:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bNRK5-0007mV-JW for bug-gnu-emacs@gnu.org; Wed, 13 Jul 2016 17:04:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Alan Third Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 13 Jul 2016 21:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23924 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 23924-submit@debbugs.gnu.org id=B23924.146844383829901 (code B ref 23924); Wed, 13 Jul 2016 21:04:01 +0000 Original-Received: (at 23924) by debbugs.gnu.org; 13 Jul 2016 21:03:58 +0000 Original-Received: from localhost ([127.0.0.1]:50216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bNRK2-0007mD-A0 for submit@debbugs.gnu.org; Wed, 13 Jul 2016 17:03:58 -0400 Original-Received: from mail-wm0-f49.google.com ([74.125.82.49]:38047) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bNRJz-0007lz-Ac for 23924@debbugs.gnu.org; Wed, 13 Jul 2016 17:03:56 -0400 Original-Received: by mail-wm0-f49.google.com with SMTP id o80so87150616wme.1 for <23924@debbugs.gnu.org>; Wed, 13 Jul 2016 14:03:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=oVwVFoyScZGg/cZlHSAKReL7+IV3EqU4oMilholegS8=; b=Bx9p8mJt4H2Fp7tE/Znp0EP2OqNDVymMLD/LaQ+gYGv6Akg0flU5kiHHkTmWE4zKT/ MPIYDp4jzeUIVXGy0+TET3ODuIDTdMDdIxIj8ShGyXk2OzGmRT6k6/1Php34wFgPJnqR 4/KiL3bPUpurG6cmFO20UjAJUBgDNOywyKJZtuEVujB8BKxFtGl6OfG9boIptkJYIe3V KmZC5RZ2ha4JNYJXdFieylLM8wCAb3L2mboUQAeKiMfsdKZlOgxIx5jMPHLhJHcUSTOE yX5uzkWzy5xPyG7u0ETjjoVb0vfxSNTT93aQx9NeT/bqjjxKWEp77CEjU9RSLab+1/hb 9rLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=oVwVFoyScZGg/cZlHSAKReL7+IV3EqU4oMilholegS8=; b=AdwKFGGIDPCzlfaGe9EhHxqrMyDPYQKu4mOXmwURuOAYEi07Hz5byqcXmzrkPB4OPx B5P7linCoz/ln5fbDSVwV5tCdq2zL7fd0SsdLJ6EcPq9dpM2mo2CkqWgVLN4506aA+wb 1/MYLoaw+SZbs7dVgDRPAcgdtqsPg2u0rbdS0KFbe92vUoBmUYK9L3Qb/KdojW6549JM eIqz4NRNonQREuXhfp4zdt0b8zqlWWXU7tX3K6u7Nt4zbMY/nYIY4gtR+bwpH4W5KFB1 ISfSVTb+etAI/PgTupfIQZiqMZGOtcTtVdJa5Od40G+59gjEg9JYP0iYERs7Qdm+stgd fPGw== X-Gm-Message-State: ALyK8tI7p4DYydcRHWU7j8YlfLmMWCgAa0qoGJTtJd68exTJcpSaMVfttbBIrvHrjeMiCA== X-Received: by 10.28.39.132 with SMTP id n126mr31551472wmn.27.1468443829631; Wed, 13 Jul 2016 14:03:49 -0700 (PDT) Original-Received: from breton.holly.idiocy.org (ip6-2001-08b0-03f8-8129-5cc4-ba14-a0d0-bdac.holly.idiocy.org. [2001:8b0:3f8:8129:5cc4:ba14:a0d0:bdac]) by smtp.gmail.com with ESMTPSA id v70sm2958329wmf.18.2016.07.13.14.03.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jul 2016 14:03:48 -0700 (PDT) Content-Disposition: inline In-Reply-To: <39AC2AF3-C87A-4743-803D-155A9E35081A@play-bow.org> User-Agent: Mutt/1.5.24 (2015-08-30) 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:121035 Archived-At: * src/nsterm.m (ns_send_appdefined): Limit bugfix for bug#18993 to OS X 10.10. --- src/nsterm.m | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/nsterm.m b/src/nsterm.m index a6160ed..a7e2649 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3942,16 +3942,21 @@ overwriting cursor (usually when cursor on a tab) */ this moment. */ #ifdef NS_IMPL_COCOA - if (! send_appdefined) - { - /* OSX 10.10.1 swallows the AppDefined event we are sending ourselves - in certain situations (rapid incoming events). - So check if we have one, if not add one. */ - NSEvent *appev = [NSApp nextEventMatchingMask:NSApplicationDefinedMask - untilDate:[NSDate distantPast] - inMode:NSDefaultRunLoopMode - dequeue:NO]; - if (! appev) send_appdefined = YES; + if ([[NSProcessInfo processInfo] respondsToSelector:@selector(operatingSystemVersion)]) + { + NSOperatingSystemVersion v = [[NSProcessInfo processInfo] operatingSystemVersion]; + + if (! send_appdefined && v.majorVersion == 10 && v.minorVersion == 10) + { + /* OSX 10.10.1 swallows the AppDefined event we are sending ourselves + in certain situations (rapid incoming events). + So check if we have one, if not add one. */ + NSEvent *appev = [NSApp nextEventMatchingMask:NSApplicationDefinedMask + untilDate:[NSDate distantPast] + inMode:NSDefaultRunLoopMode + dequeue:NO]; + if (! appev) send_appdefined = YES; + } } #endif -- Hi Bob, can you try applying this patch? The fix was originally put in place for bug#18993 which seems to be specific to OS X 10.10 (or at least, I can't replicate it here in 10.11) so I've limited the fix to that specific version and completely removed it for everything else. Hopefully it's not going to break everything, but it seems OK here. -- Alan Third