Re: Merging the xwidget branch

[Eli Zaretskii]

> From: address@hidden
> Cc: address@hidden
> Date: Sun, 17 Jan 2016 21:03:12 +0100
> 
> I have made a patch to be applied to emacs-25.
> http://www.verona.se/xwidget_mvp.diff
> 
> Basically I just made a diff between master and xwidget_mvp, and ignored
> whitespace diffs. To test it I applied it to emacs-25 using patch. It
> applied cleanly, except for a trivial rejected hunk in keyboard.c, which
> I fixed in the patch. I then retested.
> 
> I tried building withouth xwidget enabled, and with.
> 
> Could you help with applying the patch, or otherwise state how we should 
> proceed?

What kind of help do you need with the patch?  If it applies cleanly
to the emacs-25 branch, just apply it, make sure you write a good
commit log message that describes the changes, and push.

If anything else is needed, please tell.

Thanks.