From: Jason Rumney <jasonr@gnu.org>
To: Miles Bader <miles@gnu.org>
Cc: monnier@iro.umontreal.ca, mituharu@math.s.chiba-u.ac.jp,
emacs-devel@gnu.org
Subject: Re: rel-22 to trunk merge failures 2008-02-24
Date: Sun, 24 Feb 2008 15:49:34 +0000 [thread overview]
Message-ID: <47C1920E.4000307@gnu.org> (raw)
In-Reply-To: <61y79aveo0.fsf@fencepost.gnu.org>
Miles Bader wrote:
> 2008-02-15 Jason Rumney <jasonr@gnu.org>
>
> * 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 <jasonr@gnu.org>
>
> * 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.
next prev parent reply other threads:[~2008-02-24 15:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-24 10:20 rel-22 to trunk merge failures 2008-02-24 Miles Bader
2008-02-24 15:48 ` Stefan Monnier
2008-02-24 15:49 ` Jason Rumney [this message]
2008-02-24 19:07 ` Miles Bader
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=47C1920E.4000307@gnu.org \
--to=jasonr@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=miles@gnu.org \
--cc=mituharu@math.s.chiba-u.ac.jp \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).