Re: rel-22 to trunk merge failures 2008-02-24

[Jason Rumney]

Miles Bader wrote:
> 2008-02-15  Jason Rumney  <address@hidden>
>
>         * w32term.c (x_draw_glyph_string_background): Clear the background
>         manually when cleartype is in use.
>         (x_draw_glyph_string_foreground): Draw text transparently when
>         cleartype is in use.
>   

Applied manually (I can't see why this failed to merge automatically, 
the code was identical between the branches within about 10 lines of 
that change).


> 2008-02-05  Jason Rumney  <address@hidden>
>
>         * w32term.c (w32_read_socket) <WM_CHAR>: Use locale-coding-system
>         instead of using mule-unicode-* charsets directly.
>   
This change does not apply, since using unicode directly is now safe.