From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: [Emacs-diffs] emacs-24 r117695: Fix bug #18995 with compiling
	w32heap.c with -funroll-loops.
Date: Mon, 10 Nov 2014 12:50:57 +0200
Message-ID: <838ujjnxbi.fsf@gnu.org>
References: <E1XnUsw-0000vL-Au@vcs.savannah.gnu.org>
	<xad28vv6wp.fsf@fencepost.gnu.org>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: plane.gmane.org
X-Trace: ger.gmane.org 1415616704 21500 80.91.229.3 (10 Nov 2014 10:51:44 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Mon, 10 Nov 2014 10:51:44 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Glenn Morris <rgm@gnu.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 10 11:51:37 2014
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 ([208.118.235.17])
	by plane.gmane.org with esmtp (Exim 4.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1XnmZI-0001XA-BS
	for ged-emacs-devel@m.gmane.org; Mon, 10 Nov 2014 11:51:32 +0100
Original-Received: from localhost ([::1]:41897 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1XnmZI-0003Ri-24
	for ged-emacs-devel@m.gmane.org; Mon, 10 Nov 2014 05:51:32 -0500
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47636)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1XnmZ1-0003Rb-22
	for emacs-devel@gnu.org; Mon, 10 Nov 2014 05:51:20 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1XnmYv-0008BS-6W
	for emacs-devel@gnu.org; Mon, 10 Nov 2014 05:51:15 -0500
Original-Received: from mtaout20.012.net.il ([80.179.55.166]:53255)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1XnmYu-0008BF-V2; Mon, 10 Nov 2014 05:51:09 -0500
Original-Received: from conversion-daemon.a-mtaout20.012.net.il by
	a-mtaout20.012.net.il (HyperSendmail v2007.08) id
	<0NET00100KSWTK00@a-mtaout20.012.net.il>;
	Mon, 10 Nov 2014 12:51:07 +0200 (IST)
Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il
	(HyperSendmail v2007.08) with ESMTPA id
	<0NET001MFKT7J350@a-mtaout20.012.net.il>;
	Mon, 10 Nov 2014 12:51:07 +0200 (IST)
In-reply-to: <xad28vv6wp.fsf@fencepost.gnu.org>
X-012-Sender: halo1@inter.net.il
X-detected-operating-system: by eggs.gnu.org: Solaris 10
X-Received-From: 80.179.55.166
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:176679
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/176679>

> From: Glenn Morris <rgm@gnu.org>
> Cc: emacs-devel@gnu.org
> Date: Mon, 10 Nov 2014 02:41:58 -0500
> 
> 
> There seemed no earthly way to apply this to trunk, so I just dropped it.

The trunk doesn't have the code which this fixed, so dropping it is
exactly right.  Thanks.

When I committed it to the branch, I debated how to indicate that it
doesn't need to be applied to trunk, but there doesn't seem to be
anything to support that in bzrmerge.el.  Did I miss something?