From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: [RFC] Correctly handling MinGW-w64 Date: Mon, 17 Nov 2014 21:31:51 +0200 Message-ID: <83wq6taajc.fsf@gnu.org> References: <87r3x2qyjg.fsf@wanadoo.es> <546973D0.7050306@cs.ucla.edu> <87ioieqxbb.fsf@wanadoo.es> <54697A45.1040505@cs.ucla.edu> <87egt1rhy4.fsf@wanadoo.es> <546A11D5.3090402@cs.ucla.edu> <87a93prfyq.fsf@wanadoo.es> <837fytddih.fsf@gnu.org> <87tx1xptyj.fsf@wanadoo.es> <834mtxbr4t.fsf@gnu.org> <87lhn9ps2c.fsf@wanadoo.es> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1416252754 11571 80.91.229.3 (17 Nov 2014 19:32:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Nov 2014 19:32:34 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 17 20:32:29 2014 Return-path: 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 ) id 1XqS2E-00020G-EM for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 20:32:26 +0100 Original-Received: from localhost ([::1]:49894 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqS2E-00036T-0n for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 14:32:26 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqS1v-0002zk-KX for emacs-devel@gnu.org; Mon, 17 Nov 2014 14:32:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqS1q-0007HO-9V for emacs-devel@gnu.org; Mon, 17 Nov 2014 14:32:07 -0500 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:51362) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqS1q-0007HJ-2M for emacs-devel@gnu.org; Mon, 17 Nov 2014 14:32:02 -0500 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0NF7002007FDQD00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Mon, 17 Nov 2014 21:32:00 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF70024C7LBNB60@a-mtaout23.012.net.il>; Mon, 17 Nov 2014 21:32:00 +0200 (IST) In-reply-to: <87lhn9ps2c.fsf@wanadoo.es> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.175 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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:177485 Archived-At: > From: =D3scar Fuentes > Date: Mon, 17 Nov 2014 20:04:11 +0100 >=20 > Eli Zaretskii writes: >=20 > >> Ok. Commit to master or emacs-24? > > > > emacs-24, please. >=20 > The patch does not apply on emacs-24 (4 hunks fail). This can be > adapted, of course, but then there will be conflicts when merging > emacs-24 into master. I don't like the idea of forcing someone to f= ix > conflicts on areas he most probably don't know. >=20 > Since this is a correctness change that solves an hypothetical futu= re > problem, I'm inclined to check it into master and leave emacs-24 as= is. >=20 > Opinions? How about applying to both (with a suitable "don't merge to trunk" note on emacs-24)?