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: Emacs antialiasing in X Date: Tue, 17 Jan 2006 07:48:38 +0900 Message-ID: References: <200601161353.k0GDrZBx010466@coolsville.localdomain> <87y81gb0cn.fsf@boost-consulting.com> <0764532B-549F-4BB4-985E-9B93D89BB403@swipnet.se> <87zmlw9bbl.fsf@boost-consulting.com> Reply-To: snogglethorpe@gmail.com, miles@gnu.org NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: sea.gmane.org 1137451747 2409 80.91.229.2 (16 Jan 2006 22:49:07 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 16 Jan 2006 22:49:07 +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 23:49:05 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 1Eyd9j-0001U8-Vg for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 23:48:56 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EydC2-0001cA-W7 for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 17:51:19 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EydBo-0001bx-W1 for emacs-devel@gnu.org; Mon, 16 Jan 2006 17:51:05 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EydBn-0001bl-GZ for emacs-devel@gnu.org; Mon, 16 Jan 2006 17:51:04 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EydBn-0001bi-EZ for emacs-devel@gnu.org; Mon, 16 Jan 2006 17:51:03 -0500 Original-Received: from [66.249.92.194] (helo=uproxy.gmail.com) by monty-python.gnu.org with esmtp (Exim 4.34) id 1EydFN-0001o3-Ec for emacs-devel@gnu.org; Mon, 16 Jan 2006 17:54:45 -0500 Original-Received: by uproxy.gmail.com with SMTP id u2so984551uge for ; Mon, 16 Jan 2006 14:48:38 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=DqRekhRMQnBUjYxr6iYoVWK6Dqv4Fm6zCtpo9sZT3AwXO8+IgDI6sJZmwrBF/TSyAoh6rXcZwIi3TgGq5ZZ75VpOEgLcq4KP164DlGblues7KSuAWTDa8+dn2WXg/2P3AR+OIYWNv1UcBRnrVqfEmKvWiV5GnvKGcsBbV87ZSfQ= Original-Received: by 10.48.202.9 with SMTP id z9mr290995nff; Mon, 16 Jan 2006 14:48:38 -0800 (PST) Original-Received: by 10.48.3.20 with HTTP; Mon, 16 Jan 2006 14:48:38 -0800 (PST) Original-To: David Abrahams In-Reply-To: <87zmlw9bbl.fsf@boost-consulting.com> Content-Disposition: inline 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:49189 Archived-At: 2006/1/17, David Abrahams : > > No tag, but you can use the date specifier, the cvs log message gives > > the date. > > Thanks, I'll do that. FWIW, if you do use such tags you can > substantially reduce the number of conflicts you see upon merging. This whole conversation is making me very nervous .... I also merge into the emacs-unicode-2 branch (using arch), and this is normally pretty easy. I'm afraid that a botched merge (all too easy with CVS) into that same branch will make things very painful for me. Jan, how many changes are there in the XFT branch, compared to the trunk? If it's not many, how about instead I update my XFT branch in arch (it's out of date because it got merged into from the trunk, which caused lots of problems for my syncing scripts, but I can just probably just recreate it from scratch), then merge that into the unicode branch (using arch), and make a new combined branch, and then make a new CVS branch from that...? -miles -- Do not taunt Happy Fun Ball.