From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Richard Stallman <rms@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Merging unicode
Date: Wed, 30 May 2007 00:26:47 -0400
Message-ID: <E1HtFln-000051-Sh@fencepost.gnu.org>
References: <f7ccd24b0705290838s5d2ea1cfp513b281ab2a6ad06@mail.gmail.com>
Reply-To: rms@gnu.org
NNTP-Posting-Host: lo.gmane.org
Content-Type: text/plain; charset=ISO-8859-15
X-Trace: sea.gmane.org 1180499230 23877 80.91.229.12 (30 May 2007 04:27:10 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Wed, 30 May 2007 04:27:10 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: "Juanma Barranquero" <lekktu@gmail.com>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 30 06:27:09 2007
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 lo.gmane.org with esmtp (Exim 4.50)
	id 1HtFm7-0002vI-4C
	for ged-emacs-devel@m.gmane.org; Wed, 30 May 2007 06:27:07 +0200
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1HtFm6-0006Up-Gz
	for ged-emacs-devel@m.gmane.org; Wed, 30 May 2007 00:27:06 -0400
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HtFm3-0006Uk-K2
	for emacs-devel@gnu.org; Wed, 30 May 2007 00:27:03 -0400
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HtFm2-0006UY-AO
	for emacs-devel@gnu.org; Wed, 30 May 2007 00:27:02 -0400
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HtFm2-0006UV-57
	for emacs-devel@gnu.org; Wed, 30 May 2007 00:27:02 -0400
Original-Received: from fencepost.gnu.org ([199.232.76.164])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <rms@gnu.org>) id 1HtFm1-0007Yn-TV
	for emacs-devel@gnu.org; Wed, 30 May 2007 00:27:01 -0400
Original-Received: from rms by fencepost.gnu.org with local (Exim 4.60)
	(envelope-from <rms@gnu.org>)
	id 1HtFln-000051-Sh; Wed, 30 May 2007 00:26:47 -0400
In-reply-to: <f7ccd24b0705290838s5d2ea1cfp513b281ab2a6ad06@mail.gmail.com>
	(lekktu@gmail.com)
X-detected-kernel: Linux 2.6, seldom 2.4 (older, 4)
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:71977
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/71977>

    Assuming 22.1 is released in the next few days, what is the status and
    timeline with respect to merging the emacs-unicode-2 branch to the
    trunk?

The main question is whether to merge emacs-unicode-2 or multy-tty
first.  Once 22.1 is released, we can merge a few changes into the 22
branch as described in FOR-RELEASE.  Then it would be good to merge
those two branches as soon as that can feasibly be done.