From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel Subject: Re: Emacs 26 MacOS bugs Date: Fri, 9 Feb 2018 13:13:12 -0500 Message-ID: References: <20180206190518.f43jsoughhlsi22y@adversary.org> <20180206222722.5uf43fd56p44dk5z@adversary.org> <20180207004331.q4cll6nyldse2bin@adversary.org> <20180207021301.zpvpexdkewztqxo4@adversary.org> <20180207225505.GB1066@breton.holly.idiocy.org> <20180209163512.bgoqgj2ayyv4vvyq@adversary.org> <20180209172224.af3y5l5oo63mo22y@adversary.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Trace: blaine.gmane.org 1518199964 16023 195.159.176.226 (9 Feb 2018 18:12:44 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 9 Feb 2018 18:12:44 +0000 (UTC) Cc: Alan Third , Philipp Stephani , Emacs developers To: Ben McGinnes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Feb 09 19:12:40 2018 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 1ekDA4-0003f9-R6 for ged-emacs-devel@m.gmane.org; Fri, 09 Feb 2018 19:12:36 +0100 Original-Received: from localhost ([::1]:52762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekDC6-0006xw-Fd for ged-emacs-devel@m.gmane.org; Fri, 09 Feb 2018 13:14:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekDAh-0006p8-Hj for emacs-devel@gnu.org; Fri, 09 Feb 2018 13:13:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ekDAg-0005BY-JC for emacs-devel@gnu.org; Fri, 09 Feb 2018 13:13:15 -0500 Original-Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:34572) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ekDAg-000582-Bf for emacs-devel@gnu.org; Fri, 09 Feb 2018 13:13:14 -0500 Original-Received: by mail-wm0-x22d.google.com with SMTP id j21so5054241wmh.1 for ; Fri, 09 Feb 2018 10:13:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=kKUbxn5Q7Ac/RUtEQGTISo7jrLLAtXQLApXRTzmqhyA=; b=MGb1SpRw60YWqfChUD+IfaB0AD3IyZgjqB+3e6jr3WsPKYf10I6SPlQRAzNRBzZXNR FfQyrNKAy0tXiibrsrLJnIdU8G5EYKL6TnBhLYLhqDpn2xSjkoLowdL2R7fsPUo4nnwl NRiI4RP3kx8L+0xp5JtvlgwbCbmyIcvEbG4qdeJBWIHfS0z3JSIS77sUltJYKxypihO+ PxsJG2k2S886aBGZ8qm4lgisEA45Di86IJU3f2DBQ3GwJcntOxgYN9awqLvE7rhS1j5I qN1LkVhYxn1uHA/QaFXLAWpoEsT20EZHDXHRirEh2tOq6b5MSuLe12VbexcKM9T97Bzs 2sVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=kKUbxn5Q7Ac/RUtEQGTISo7jrLLAtXQLApXRTzmqhyA=; b=c1aVqZOCk+XwiMLr87kDpBUCRae+IzJ9Ksa+haH2bM7Pc/wdAsIVKAabOpFKn0i3UK maAXgnNIq3vr8G5Ucn/VueFYFLziIYXiYUp016L2QrOPUo7X9HNLgbFEccYBq+cwsN+Q fgfZ1tQxpkkn58OxOm7/+8BHj1VY8zzBvmAG+2Wyu8vjzqY/bfa2OioWK9PS7AHcv3+A jeVQRc5bm0yizpovhikZ2i0HgNSZVDhAtEec1ihpWEPiqDsF40YWg1PrQqHj5OK0kotD ayF/QSVonf1GrTsMCeTGmIE8oQCLTbYQGlOWyWWg18oGjNHgvbG4iqTM3NtIoxocpvZi yUgw== X-Gm-Message-State: APf1xPBC9ArlRirsV/xy02b3WtxXQiX1OCxXXtOf8CQGnVT/gaK8C+pq ztVcyMj9S1/MKWsWf8+wM7DRTPIXSBZMh9+pKzU38Q== X-Google-Smtp-Source: AH8x227HXrm2fS+D+HWnnUsc9Yi1UdlQwatuK7xXtIkMGQtaYTY2kcIHUJmqJkfTsDyBGzQ4d3EKvjqtmbKtQLcfQ5M= X-Received: by 10.28.239.19 with SMTP id n19mr2717897wmh.20.1518199993353; Fri, 09 Feb 2018 10:13:13 -0800 (PST) Original-Received: by 10.223.182.69 with HTTP; Fri, 9 Feb 2018 10:13:12 -0800 (PST) In-Reply-To: <20180209172224.af3y5l5oo63mo22y@adversary.org> X-Google-Sender-Auth: 86zf5xGci0rMh_sDNz8wOv-S4G4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22d 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:222640 Archived-At: On Fri, Feb 9, 2018 at 12:22 PM, Ben McGinnes wrote: > Preceded by the commit I've been referring to: > > commit a0c7157a16481b0523ad20cda9115f9435188f73 > Merge: c24c5dc4a4 c787a49682 Looking at the diff of [a0c7157] (e.g., with git show -p --stat a0c7157), I can see the merge mainly affected documentation and did not touch src/nsterm.m, unlike [8fbf285] (the commit you identified as the original source of trouble). By default git shows the diff against the first parent [p1] which is the previous commit of master, if you look at the diff against the second parent [p2] you see the diff against the emacs-26 commit which was merged. The latter diff shows the nsterm.m modification, indicating that master has the modification, but emacs-26 does not. [a0c7157]: 2018-02-05 07:50:22 -0800 Merge from origin/emacs-26 https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=a0c7157a16481b0523ad20cda9115f9435188f73 [8fbf285]: 2018-02-04 20:44:45 +0100 Fix handling of modifier keys on macOS https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=8fbf28536ee1169f59206523e2af050916befbf6 [p1]: https://git.savannah.gnu.org/cgit/emacs.git/diff/?id=a0c7157a16481b0523ad20cda9115f9435188f73&id2=c24c5dc4a4cc18e7f1ec949efcfe1d4bae541d02 [p2]: https://git.savannah.gnu.org/cgit/emacs.git/diff/?id=a0c7157a16481b0523ad20cda9115f9435188f73&id2=c787a4968273027960a20ced6d63bae0d1ffa87e