From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: "Jan D." <jan.h.d@swipnet.se>
Newsgroups: gmane.emacs.devel
Subject: Re: Emacs antialiasing in X
Date: Mon, 16 Jan 2006 14:53:35 +0100 (CET)
Message-ID: <200601161353.k0GDrZBx010466@coolsville.localdomain>
References: <87slrocmxi.fsf@boost-consulting.com>
NNTP-Posting-Host: main.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Trace: sea.gmane.org 1137431718 3730 80.91.229.2 (16 Jan 2006 17:15:18 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Mon, 16 Jan 2006 17:15:18 +0000 (UTC)
Cc: emacs-devel@gnu.org, Kenichi Handa <handa@m17n.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 16 18:15:12 2006
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 1EyXwP-0002Ka-3J
	for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 18:14:49 +0100
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1EyXr2-0000sX-SQ
	for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 12:09:16 -0500
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EyVaX-0006rW-O6
	for emacs-devel@gnu.org; Mon, 16 Jan 2006 09:44:06 -0500
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EyVN0-0004BB-QQ
	for emacs-devel@gnu.org; Mon, 16 Jan 2006 09:30:09 -0500
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EyUqG-0005HA-8j
	for emacs-devel@gnu.org; Mon, 16 Jan 2006 08:56:17 -0500
Original-Received: from [195.54.107.73] (helo=mxfep02.bredband.com)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EyUtl-0004OL-VH
	for emacs-devel@gnu.org; Mon, 16 Jan 2006 08:59:54 -0500
Original-Received: from coolsville.localdomain ([83.226.180.193] [83.226.180.193])
	by mxfep02.bredband.com with ESMTP id
	<20060116135336.GHTD2008.mxfep02.bredband.com@coolsville.localdomain>;
	Mon, 16 Jan 2006 14:53:36 +0100
Original-Received: (from jhd@localhost)
	by coolsville.localdomain (8.13.4/8.13.4/Submit) id k0GDrZBx010466;
	Mon, 16 Jan 2006 14:53:35 +0100
In-Reply-To: <87slrocmxi.fsf@boost-consulting.com> "from David Abrahams at Jan
	16, 2006 08:38:49 am"
Original-To: David Abrahams <dave@boost-consulting.com>
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:49172
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/49172>

> "Jan D." <jan.h.d@swipnet.se> writes:
> 
> >> Are you telling me that edits made to ChangeLog, NEWS, etc., in the
> >> XFT branch are expendable?
> >
> > Yes, because those files have not been changed.  
> 
> 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?

One would think so.  However, when I merge stuff from HEAD to the XFT
branch, I get conflicts in files I know I have not modified.  Probably some
merge expert can explain why that happens.

	Jan D.