Re: unicode merge failures 2007-10-12

[Jason Rumney]

Miles Bader wrote:
> M  src/xdisp.c
> M  src/coding.c
>   
These two look like multi-tty wins - the only difference being that
global variables are replaced with members of the terminal struct.

The others are harder to judge, my approach would be to diff each one
with its branch point, and decide which has the simpler changes, then
try to manually apply the equivalent changes to the other branch's
version. encoded-kb.el seems to have been completely rewritten for
multi-tty, but the others look like the actual changes involved could be
quite simple.