From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Rumney Newsgroups: gmane.emacs.devel Subject: Re: rel-22 to trunk merge failures 2008-02-24 Date: Sun, 24 Feb 2008 15:49:34 +0000 Message-ID: <47C1920E.4000307@gnu.org> References: <61y79aveo0.fsf@fencepost.gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1203868200 20343 80.91.229.12 (24 Feb 2008 15:50:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 24 Feb 2008 15:50:00 +0000 (UTC) Cc: monnier@iro.umontreal.ca, mituharu@math.s.chiba-u.ac.jp, emacs-devel@gnu.org To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 24 16:50:23 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 1JTJ7O-0005Sp-KP for ged-emacs-devel@m.gmane.org; Sun, 24 Feb 2008 16:50:22 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JTJ6s-0006yA-UH for ged-emacs-devel@m.gmane.org; Sun, 24 Feb 2008 10:49:50 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JTJ6n-0006vY-0B for emacs-devel@gnu.org; Sun, 24 Feb 2008 10:49:45 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JTJ6k-0006sL-TP for emacs-devel@gnu.org; Sun, 24 Feb 2008 10:49:44 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JTJ6k-0006sF-Lo for emacs-devel@gnu.org; Sun, 24 Feb 2008 10:49:42 -0500 Original-Received: from mk-outboundfilter-4.mail.uk.tiscali.com ([212.74.114.32]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JTJ6g-000608-Np; Sun, 24 Feb 2008 10:49:38 -0500 Original-X-Trace: 12357984/mk-outboundfilter-2.mail.uk.tiscali.com/F2S/$ACCEPTED/freedom2Surf-customers/83.67.23.108 X-SBRS: None X-RemoteIP: 83.67.23.108 X-IP-MAIL-FROM: jasonr@gnu.org X-IP-BHB: Once X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgAAALsgwUdTQxds/2dsb2JhbAAIqXM X-IronPort-AV: E=McAfee;i="5200,2160,5236"; a="12357984" X-IronPort-AV: E=Sophos;i="4.25,397,1199664000"; d="scan'208";a="12357984" X-IP-Direction: OUT Original-Received: from i-83-67-23-108.freedom2surf.net (HELO [127.0.0.1]) ([83.67.23.108]) by smtp.f2s.tiscali.co.uk with ESMTP/TLS/DHE-RSA-AES256-SHA; 24 Feb 2008 15:49:37 +0000 User-Agent: Thunderbird 2.0.0.9 (Windows/20071031) In-Reply-To: <61y79aveo0.fsf@fencepost.gnu.org> X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. 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:90241 Archived-At: Miles Bader wrote: > 2008-02-15 Jason Rumney > > * 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 > > * w32term.c (w32_read_socket) : Use locale-coding-system > instead of using mule-unicode-* charsets directly. > This change does not apply, since using unicode directly is now safe.