From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Glenn Morris <rgm@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: NS compile error after trunk merge r118324
Date: Mon, 10 Nov 2014 02:40:59 -0500
Message-ID: <ggh9y7v6yc.fsf@fencepost.gnu.org>
References: <39AB655E-CA13-48E3-8E5C-4B322DCB6F3C@gmail.com>
	<E3BCA9F8-C9B6-44D2-906E-84CB7890DA77@swipnet.se>
	<5h61eo6u3w.fsf@fencepost.gnu.org>
	<CB0DA792-6BE8-4F50-9FE9-0A46242DEE13@swipnet.se>
	<os7fz4vv75.fsf@fencepost.gnu.org>
	<30A0C539-0202-4488-932A-A7DCB7FF9868@swipnet.se>
NNTP-Posting-Host: plane.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: ger.gmane.org 1415605287 12125 80.91.229.3 (10 Nov 2014 07:41:27 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Mon, 10 Nov 2014 07:41:27 +0000 (UTC)
Cc: Adrian Robert <adrian.b.robert@gmail.com>,
	"emacs-devel@gnu.org Development" <emacs-devel@gnu.org>
To: Jan =?utf-8?Q?Dj=C3=A4rv?= <jan.h.d@swipnet.se>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 10 08:41:20 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 1XnjbB-00070q-UR
	for ged-emacs-devel@m.gmane.org; Mon, 10 Nov 2014 08:41:18 +0100
Original-Received: from localhost ([::1]:41323 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 1XnjbB-0005JI-Ic
	for ged-emacs-devel@m.gmane.org; Mon, 10 Nov 2014 02:41:17 -0500
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36988)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1Xnjav-00051o-JU
	for emacs-devel@gnu.org; Mon, 10 Nov 2014 02:41:02 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rgm@gnu.org>) id 1Xnjau-0004ks-F9
	for emacs-devel@gnu.org; Mon, 10 Nov 2014 02:41:01 -0500
Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:50391)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1Xnjau-0004ko-BU
	for emacs-devel@gnu.org; Mon, 10 Nov 2014 02:41:00 -0500
Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71)
	(envelope-from <rgm@gnu.org>)
	id 1Xnjat-0007e6-GP; Mon, 10 Nov 2014 02:40:59 -0500
X-Spook: EuroFed Taiwan CIA pipeline global weapons of mass
X-Ran: Ek!R8h(X$>HF+(qU:C\8kU|T]J:'H=;R5nje*KI)q-CRA'b1Nh)pi9=:s<Y$^Wb8iKO$XM
X-Hue: black
X-Attribution: GM
In-Reply-To: <30A0C539-0202-4488-932A-A7DCB7FF9868@swipnet.se> ("Jan
	=?utf-8?Q?Dj=C3=A4rv=22's?=
	message of "Mon, 10 Nov 2014 07:17:42 +0100")
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
	(bad octet value).
X-Received-From: 2001:4830:134:3::e
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:176667
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/176667>


BTw, if you (anyone) knows there is going to be a non-trivial merge
conflict, you can mark the emacs-24 change "do not merge to trunk" and
apply it by hand yourself to trunk.