From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: John Wiegley Newsgroups: gmane.emacs.devel Subject: Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25 Date: Mon, 18 Jan 2016 23:38:45 -0800 Message-ID: References: <20160112070839.6841.77764@vcs.savannah.gnu.org> <0mlh7u7nds.fsf@fencepost.gnu.org> <569538BA.9020208@cs.ucla.edu> Reply-To: John Wiegley NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1453189164 15434 80.91.229.3 (19 Jan 2016 07:39:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 19 Jan 2016 07:39:24 +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 Tue Jan 19 08:39:16 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 1aLQsk-0001An-Mg for ged-emacs-devel@m.gmane.org; Tue, 19 Jan 2016 08:39:14 +0100 Original-Received: from localhost ([::1]:35503 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLQsj-0001Oq-LO for ged-emacs-devel@m.gmane.org; Tue, 19 Jan 2016 02:39:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLQsU-0001Ob-Ep for emacs-devel@gnu.org; Tue, 19 Jan 2016 02:38:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLQsQ-0003U2-Ee for emacs-devel@gnu.org; Tue, 19 Jan 2016 02:38:58 -0500 Original-Received: from mail-pf0-x233.google.com ([2607:f8b0:400e:c00::233]:34310) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLQsQ-0003Tk-7j; Tue, 19 Jan 2016 02:38:54 -0500 Original-Received: by mail-pf0-x233.google.com with SMTP id q63so176050334pfb.1; Mon, 18 Jan 2016 23:38:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:in-reply-to:date:message-id:references :user-agent:reply-to:mail-followup-to:mime-version:content-type; bh=Ymqe/wse5cjKeLcHkmKBUfZ808539hUBQePzwSA72ec=; b=BrBvVCOSh8b+yTg9aet9R1WWvtB/VV1NYM1m/IMsl07yFODarvkkmkrg2O8UmpGpnh mtyjUUqzPGCXK10PPDaVQE9Vu7cTPeGDWs6UMDLty3EblmqXCLF42Hi++O4BRe4wEgY+ b22eGcTPI1GlpJ6HJGEVy/mdKAsv4jItzeB5WiW5kRDHNlXM5uBsw33+kL48T+g5wUuR yjIrBWjVCYOL83Eb+r5VfL23x6q5CIDa1hop005aNNlFJTy9hvAFA+JMZ1hKHv1ObaET fKFAI0bNj4+8Nakwa4LfG9Hi8FfPJZT28qDrtd3jfh3BRaj8UMQI+gHrMDCiBC7FJwBU 0ULg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:in-reply-to:date:message-id :references:user-agent:reply-to:mail-followup-to:mime-version :content-type; bh=Ymqe/wse5cjKeLcHkmKBUfZ808539hUBQePzwSA72ec=; b=cLsBDZbbT08w5XqkFvQwDO697hBtgJhg+WXF/uemqjs0Et5J3DeaQVBxh31GPfuXKd jI6s2QSObivlP2GPNknNNyQkZjdAKvpOwhT9HSBdN5Xe1UvbQAhdLGxNunBOmgI4X38A EIV6s6QHs61zPHpz47H9xmFl6t/fYuFxr9/XhOJwM9div9c8FS48ktdG20+XsaWLpef8 DZrhiGQwdhgTCMGFrkksweZzpBjHSPV4BtHWJW8ogDYniZTQzajh/+mCYKsJSpngaNgP t2rq/aauCpUuV30Usu9mQAbhVKJO2SKBjAHRgSzToWjk098c4aAwOzG5vPzZxUorasay pixg== X-Gm-Message-State: ALoCoQndRj4fqRCjoeVNvRCympSoZvZYPHC21IEiBDFfhMIjVw0Taxh31RI+Ss+BddVL3OfvGanHDyUWEqtMEQhF+eG2VIHC8Q== X-Received: by 10.98.68.211 with SMTP id m80mr42480788pfi.117.1453189133495; Mon, 18 Jan 2016 23:38:53 -0800 (PST) Original-Received: from Vulcan.local (76-234-68-79.lightspeed.frokca.sbcglobal.net. [76.234.68.79]) by smtp.gmail.com with ESMTPSA id 76sm33296265pfl.36.2016.01.18.23.38.52 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Jan 2016 23:38:52 -0800 (PST) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.local (Postfix, from userid 501) id 11C86124DA7E5; Mon, 18 Jan 2016 23:38:52 -0800 (PST) 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.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) Mail-Followup-To: Paul Eggert , Glenn Morris , emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::233 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:198343 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. :-) Just a note that the four commits above have been cherry picked to master, and another merge from emacs-25 has been performed. -- John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2