Re: Emacs 26 MacOS bugs

[Noam Postavsky]

On Fri, Feb 9, 2018 at 12:22 PM, Ben McGinnes <address@hidden> 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