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: master 70f3e4e 08/15: ; Merge from origin/emacs-25 Date: Thu, 14 Jan 2016 23:15:39 +0000 Message-ID: <87k2nbwy5g.fsf@russet.org.uk> References: <20160112070839.6841.77764@vcs.savannah.gnu.org> <0mlh7u7nds.fsf@fencepost.gnu.org> <569538BA.9020208@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1452813367 2386 80.91.229.3 (14 Jan 2016 23:16:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 14 Jan 2016 23:16:07 +0000 (UTC) Cc: Glenn Morris , emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 15 00:15:58 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 1aJr7Q-00042p-1n for ged-emacs-devel@m.gmane.org; Fri, 15 Jan 2016 00:15:52 +0100 Original-Received: from localhost ([::1]:44857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJr7O-0000TD-S8 for ged-emacs-devel@m.gmane.org; Thu, 14 Jan 2016 18:15:50 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJr7L-0000T4-Mg for emacs-devel@gnu.org; Thu, 14 Jan 2016 18:15:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJr7K-0003Pv-RI for emacs-devel@gnu.org; Thu, 14 Jan 2016 18:15:47 -0500 Original-Received: from cheviot22.ncl.ac.uk ([128.240.234.22]:50897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJr7F-0003Nr-7R; Thu, 14 Jan 2016 18:15:41 -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 1aJr7E-0003oq-FM; Thu, 14 Jan 2016 23:15:40 +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 1aJr7E-0008Q3-3o; Thu, 14 Jan 2016 23:15:40 +0000 In-Reply-To: <569538BA.9020208@cs.ucla.edu> (Paul Eggert's message of "Tue, 12 Jan 2016 09:32:42 -0800") 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:198164 Archived-At: Paul Eggert writes: > On 01/12/2016 09:11 AM, John Wiegley wrote: >> 1 31a97ac Michael Albinus : Merge branch 'emacs-25' of git.sv.gnu.org:... >> 2 e79b06e Paul Eggert : Avoid stdio in SIGINT handler >> 3 5213ded Jens Lechtenboerger : Refactor mml-smime.el, mml1991.el, mml2015.el >> 4 372d00a Glenn Morris : ; Auto-commit of loaddefs files. >> 5 9825305 Paul Eggert : Merge from gnulib >> 6 30f4a89 YAMAMOTO Mitsuharu : Move variables to inner loop, preparing for... >> >> I take it #1 and #4 are valid skips, but the other four should be >> cherry-picked into master? Do we have a special command or annotation for >> doing so? > > I don't think so, no. I would just install the patches into master. (It's not > likely that anyone will want to backport them into emacs-25. :-) I think 372d00a should validly be skipped. The loaddefs files shouldn't need auto-committing on master. Phil