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,gmane.emacs.pretest.bugs
Subject: Re: 23.0.50; ^D inserted into network streams
Date: Mon, 24 Dec 2007 16:55:38 -0500
Message-ID: <E1J6vGs-00016m-Fb@fencepost.gnu.org>
References: <871wa56w75.fsf@freemail.hu> <E1Iz4W8-0007nH-4K@fencepost.gnu.org>
	<wly7bk4ow3.wl%mituharu@math.s.chiba-u.ac.jp>
Reply-To: rms@gnu.org
NNTP-Posting-Host: lo.gmane.org
Content-Type: text/plain; charset=ISO-8859-15
X-Trace: ger.gmane.org 1198533361 10212 80.91.229.12 (24 Dec 2007 21:56:01 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Mon, 24 Dec 2007 21:56:01 +0000 (UTC)
Cc: emacs-pretest-bug@gnu.org, mange@freemail.hu, miles@gnu.org
To: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 24 22:56:14 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 1J6vHM-0008Jv-Me
	for ged-emacs-devel@m.gmane.org; Mon, 24 Dec 2007 22:56:08 +0100
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1J6vH2-0004WL-8D
	for ged-emacs-devel@m.gmane.org; Mon, 24 Dec 2007 16:55:48 -0500
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1J6vGy-0004Vz-3d
	for emacs-devel@gnu.org; Mon, 24 Dec 2007 16:55:44 -0500
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1J6vGv-0004VP-8G
	for emacs-devel@gnu.org; Mon, 24 Dec 2007 16:55:42 -0500
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1J6vGv-0004VJ-0W
	for emacs-devel@gnu.org; Mon, 24 Dec 2007 16:55:41 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <rms@gnu.org>) id 1J6vGv-0007Li-4e
	for emacs-devel@gnu.org; Mon, 24 Dec 2007 16:55:41 -0500
Original-Received: from rms by fencepost.gnu.org with local (Exim 4.60)
	(envelope-from <rms@gnu.org>)
	id 1J6vGs-00016m-Fb; Mon, 24 Dec 2007 16:55:38 -0500
In-reply-to: <wly7bk4ow3.wl%mituharu@math.s.chiba-u.ac.jp> (message from
	YAMAMOTO Mitsuharu on Mon, 24 Dec 2007 14:56:12 +0900)
X-detected-kernel: by monty-python.gnu.org: 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:85432 gmane.emacs.pretest.bugs:20477
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/85432>

    Miles, please do not propagate the following change to the trunk at
    the merger next time.

I have an idea.  You could rearrange the code in the trunk
somewhat, so that the Emacs 22 patch would not merge in cleanly,
and add a comment in Emacs 22 saying "don't merge this into Emacs 23".
Together, they will be a reminder that would be hard to miss.