From: Miles Bader <miles@gnu.org>
To: Jason Rumney <jasonr@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: Mon, 25 Feb 2008 04:07:29 +0900 [thread overview]
Message-ID: <87lk5acgwe.fsf@catnip.gol.com> (raw)
In-Reply-To: <47C1920E.4000307@gnu.org> (Jason Rumney's message of "Sun, 24 Feb 2008 15:49:34 +0000")
Jason Rumney <jasonr@gnu.org> writes:
>> * 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).
Those hunks did apply, but I reverted everything in the same file, just
in case there's some connection I don't grasp (that can still happen
across files of course, but it's usually a bit less likely I think).
-Miles
--
Cannon, n. An instrument employed in the rectification of national boundaries.
prev parent reply other threads:[~2008-02-24 19:07 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
2008-02-24 19:07 ` Miles Bader [this message]
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=87lk5acgwe.fsf@catnip.gol.com \
--to=miles@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=jasonr@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).