Re: merge conflict in keyboard.c in the xwidget branch

[Eli Zaretskii]

> From: address@hidden
> Date: Sun, 11 Jan 2015 13:26:25 +0100
> 
> I was going to merge master to xwidget, as I susally do.
> 
> There was a pretty large conflict that I didnt understand though.
> It is included below.
> 
> The only thing I actuall have in this conflict is this:
> #ifdef HAVE_XWIDGETS
> Lisp_Object Qxwidget_event;
> #endif
> 
> How do I go about resolving the conflict properly?

None of the Q* variables that represent symbols should be declared
now.  Their declarations will be generated automagically.  You need to
have the DEFSYM lines for each one of them, and that's all.

So simply remove all those declarations, and rebuild.