From: Noam Postavsky <npostavs@users.sourceforge.net>
To: Ben McGinnes <ben@adversary.org>
Cc: Alan Third <alan@idiocy.org>,
Philipp Stephani <p.stephani2@gmail.com>,
Emacs developers <emacs-devel@gnu.org>
Subject: Re: Emacs 26 MacOS bugs
Date: Fri, 9 Feb 2018 13:13:12 -0500 [thread overview]
Message-ID: <CAM-tV-9ya=+fh0Y5OEuNmNrNj3qrT8CpweWpXDjnmoemab2pTA@mail.gmail.com> (raw)
In-Reply-To: <20180209172224.af3y5l5oo63mo22y@adversary.org>
On Fri, Feb 9, 2018 at 12:22 PM, Ben McGinnes <ben@adversary.org> 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
next prev parent reply other threads:[~2018-02-09 18:13 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-06 14:49 Emacs 26 MacOS bugs Richard Stallman
2018-02-06 17:30 ` Noam Postavsky
2018-02-06 23:28 ` Paul Eggert
2018-02-07 3:37 ` Eli Zaretskii
2018-02-10 14:55 ` Uwe Brauer
2018-02-10 15:18 ` Noam Postavsky
2018-02-07 3:52 ` Eli Zaretskii
2018-02-06 19:05 ` Ben McGinnes
2018-02-06 20:30 ` Noam Postavsky
2018-02-06 22:27 ` Ben McGinnes
2018-02-06 22:30 ` Ben McGinnes
2018-02-06 22:50 ` Noam Postavsky
2018-02-07 0:43 ` Ben McGinnes
2018-02-07 1:33 ` Noam Postavsky
2018-02-07 2:13 ` Ben McGinnes
2018-02-07 22:55 ` Alan Third
2018-02-09 16:35 ` Ben McGinnes
2018-02-09 16:57 ` Noam Postavsky
2018-02-09 17:22 ` Ben McGinnes
2018-02-09 18:13 ` Noam Postavsky [this message]
2018-02-10 1:46 ` Ben McGinnes
2018-02-10 1:47 ` Alan Third
2018-02-11 13:53 ` Philipp Stephani
2018-02-11 21:06 ` Alan Third
2018-02-07 20:01 ` Alan Third
2018-02-10 15:01 ` Alan Third
2018-02-10 22:45 ` Alan Third
2018-02-11 11:47 ` Alan Third
2018-02-11 15:52 ` Eli Zaretskii
2018-02-11 20:57 ` Alan Third
2018-02-13 19:41 ` Ben McGinnes
2018-02-13 19:46 ` Noam Postavsky
2018-02-11 20:43 ` Richard Stallman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAM-tV-9ya=+fh0Y5OEuNmNrNj3qrT8CpweWpXDjnmoemab2pTA@mail.gmail.com' \
--to=npostavs@users.sourceforge.net \
--cc=alan@idiocy.org \
--cc=ben@adversary.org \
--cc=emacs-devel@gnu.org \
--cc=p.stephani2@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.