From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Abrahams Newsgroups: gmane.emacs.devel Subject: Re: Emacs antialiasing in X Date: Mon, 16 Jan 2006 13:01:38 -0500 Message-ID: <87psmsaw71.fsf@boost-consulting.com> References: <200601160814.k0G8Etc3009367@coolsville.localdomain> <87slrocmxi.fsf@boost-consulting.com> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1137440594 21590 80.91.229.2 (16 Jan 2006 19:43:14 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 16 Jan 2006 19:43:14 +0000 (UTC) Cc: "Jan D." , Kenichi Handa , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 16 20:43:11 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EyaFt-0004ju-Of for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 20:43:05 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyaIC-0000sG-9Q for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 14:45:28 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EyYiw-0002Lr-8Q for emacs-devel@gnu.org; Mon, 16 Jan 2006 13:04:58 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EyYit-0002K5-KQ for emacs-devel@gnu.org; Mon, 16 Jan 2006 13:04:57 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyYit-0002Jv-5h for emacs-devel@gnu.org; Mon, 16 Jan 2006 13:04:55 -0500 Original-Received: from [207.172.4.62] (helo=smtp02.mrf.mail.rcn.net) by monty-python.gnu.org with esmtp (Exim 4.34) id 1EyYmR-0005iF-1t for emacs-devel@gnu.org; Mon, 16 Jan 2006 13:08:35 -0500 Original-Received: from 209-150-60-201.c3-0.smr-ubr2.sbo-smr.ma.cable.rcn.com (HELO localhost.localdomain.boost-consulting.com) ([209.150.60.201]) by smtp02.mrf.mail.rcn.net with ESMTP; 16 Jan 2006 13:02:30 -0500 X-IronPort-AV: i="3.99,373,1131339600"; d="scan'208"; a="195545425:sNHT108365594" Original-To: Stefan Monnier In-Reply-To: (Stefan Monnier's message of "Mon, 16 Jan 2006 11:51:11 -0500") User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux) 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:49182 Archived-At: Stefan Monnier writes: >> I don't mean to be difficult, but I think "CVS merge" disagrees with >> you. If they had not been changed at all, wouldn't it leave them >> untouched when I merge the XFT branch into the unicode-2 branch? > > It's probably just spurious conflicts due to repeated merging. CVS is > notoriously bad at keeping track of what has already been merged. > > Better work from the Arch branches managed by Miles when you need to merge. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Wow, even more confusing. The above is meaningless to me. Can you explain? Thanks, -- Dave Abrahams Boost Consulting www.boost-consulting.com