Re: Possible merge conflict in src/macterm.[ch]

[Andreas Tobler]

Miles Bader wrote:
> Hi,
>
> I merged the appended changes to macterm.[ch] from the Emacs 22 release
> branch to the trunk.  As there were merge conflicts, and apparently some
> trunk changes touched the same code, it seems likely that either this
> change shouldn't have been merged, or that I incorrectly resolved the
> conflict.
>
> Please check the state of macterm.[ch] in the trunk and make sure it is
> correct.
>
> [The appended ChangeLog entry is the original, but the diff is the
> change I applied to the trunk, after I tried to fix the conflicts.]


It's wrong or at least incomplete. Only the .c is merged. I guess the .h 
needs a merge as well.

I try to figure out what's missing.

Andreas