From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: phillip.lord@russet.org.uk (Phillip Lord) Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] emacs-25 f5c762c: Additional changes for "make check-expensive" Date: Thu, 14 Jan 2016 22:15:36 +0000 Message-ID: <8760yvyfhz.fsf@russet.org.uk> References: <20160105084751.30334.99051@vcs.savannah.gnu.org> <87io2y66dl.fsf@russet.org.uk> <87pox6wrtb.fsf@gmx.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1452812755 23241 80.91.229.3 (14 Jan 2016 23:05:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 14 Jan 2016 23:05:55 +0000 (UTC) Cc: emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 15 00:05:47 2016 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 1aJqxe-0004wv-AZ for ged-emacs-devel@m.gmane.org; Fri, 15 Jan 2016 00:05:46 +0100 Original-Received: from localhost ([::1]:44834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJqxd-0005Ov-Is for ged-emacs-devel@m.gmane.org; Thu, 14 Jan 2016 18:05:45 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJqwo-0004if-VH for emacs-devel@gnu.org; Thu, 14 Jan 2016 18:04:55 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJqwk-00006o-C0 for emacs-devel@gnu.org; Thu, 14 Jan 2016 18:04:54 -0500 Original-Received: from cheviot22.ncl.ac.uk ([128.240.234.22]:50663) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJqwk-00006c-5t for emacs-devel@gnu.org; Thu, 14 Jan 2016 18:04:50 -0500 Original-Received: from smtpauth-vm.ncl.ac.uk ([10.8.233.129] helo=smtpauth.ncl.ac.uk) by cheviot22.ncl.ac.uk with esmtp (Exim 4.63) (envelope-from ) id 1aJqwh-0008NY-Et; Thu, 14 Jan 2016 23:04:47 +0000 Original-Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118] helo=localhost) by smtpauth.ncl.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1aJqwh-00083Z-Bm; Thu, 14 Jan 2016 23:04:47 +0000 In-Reply-To: <87pox6wrtb.fsf@gmx.de> (Michael Albinus's message of "Tue, 12 Jan 2016 19:55:44 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 128.240.234.22 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:198162 Archived-At: Michael Albinus writes: > John Wiegley writes: > >> Hi Phillip, we need to get all of this straightened out, let me know so that I >> can reflect the same changes into master, in order to repair what was lost of >> this work during yesterdays' merge. > > I believe Philip is not speaking about a problem of the merge from > yesterday. It's about my original commit to the emacs-25 branch. Yep, no worries about the merge. Michael's change went in a while back. Phil