From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: rel-22 to trunk merge failures 2008-02-24 Date: Mon, 25 Feb 2008 04:07:29 +0900 Message-ID: <87lk5acgwe.fsf@catnip.gol.com> References: <61y79aveo0.fsf@fencepost.gnu.org> <47C1920E.4000307@gnu.org> Reply-To: Miles Bader NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1203880083 26730 80.91.229.12 (24 Feb 2008 19:08:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 24 Feb 2008 19:08:03 +0000 (UTC) Cc: monnier@iro.umontreal.ca, mituharu@math.s.chiba-u.ac.jp, emacs-devel@gnu.org To: Jason Rumney Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 24 20:08:27 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JTMCv-0006jU-Ey for ged-emacs-devel@m.gmane.org; Sun, 24 Feb 2008 20:08:17 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JTMCP-0003My-Qh for ged-emacs-devel@m.gmane.org; Sun, 24 Feb 2008 14:07:45 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JTMCM-0003Ms-Ur for emacs-devel@gnu.org; Sun, 24 Feb 2008 14:07:42 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JTMCL-0003Mg-HM for emacs-devel@gnu.org; Sun, 24 Feb 2008 14:07:42 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JTMCL-0003Md-DZ for emacs-devel@gnu.org; Sun, 24 Feb 2008 14:07:41 -0500 Original-Received: from smtp11.dentaku.gol.com ([203.216.5.73]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JTMCE-0006PK-88; Sun, 24 Feb 2008 14:07:34 -0500 Original-Received: from 203-216-97-013.dsl.gol.ne.jp ([203.216.97.13] helo=catnip.gol.com) by smtp11.dentaku.gol.com with esmtpa (Dentaku) id 1JTMCB-0003ZI-17; Mon, 25 Feb 2008 04:07:31 +0900 Original-Received: by catnip.gol.com (Postfix, from userid 1000) id 0AFFA2FF8; Mon, 25 Feb 2008 04:07:29 +0900 (JST) System-Type: i686-pc-linux-gnu In-Reply-To: <47C1920E.4000307@gnu.org> (Jason Rumney's message of "Sun, 24 Feb 2008 15:49:34 +0000") Original-Lines: 18 X-Virus-Scanned: ClamAV GOL (outbound) X-Abuse-Complaints: abuse@gol.com X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:90259 Archived-At: Jason Rumney 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.