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: Tue, 12 Jan 2016 09:11:21 -0800 Message-ID: References: <20160112070839.6841.77764@vcs.savannah.gnu.org> <0mlh7u7nds.fsf@fencepost.gnu.org> Reply-To: John Wiegley NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1452618773 31499 80.91.229.3 (12 Jan 2016 17:12:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 Jan 2016 17:12:53 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 12 18:12:45 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 1aJ2Us-00072R-9p for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2016 18:12:42 +0100 Original-Received: from localhost ([::1]:33293 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ2Uo-0003mF-18 for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2016 12:12:38 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ2Tj-0002hj-24 for emacs-devel@gnu.org; Tue, 12 Jan 2016 12:11:31 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJ2Tf-000156-SV for emacs-devel@gnu.org; Tue, 12 Jan 2016 12:11:30 -0500 Original-Received: from mail-pf0-x233.google.com ([2607:f8b0:400e:c00::233]:34044) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ2Tf-00014x-NQ; Tue, 12 Jan 2016 12:11:27 -0500 Original-Received: by mail-pf0-x233.google.com with SMTP id q63so67719555pfb.1; Tue, 12 Jan 2016 09:11:27 -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=KnCV625P7lSsc12S8uIRIvIYoTwmPbD/crgffnP4h5U=; b=ZWQJnSoGisyBpyQPbsl6hf+HhLpTvREoFVjse0ggWErM9473mgm8NUCyDW6McWiejj ovytP0RiBmA+qA1SWavfcc5++yt4+tdK/c9e2HUVoef5hnEueUJYenM1CwW5ed//rqIF JiGze2gTOFsTWegTbSGJYfEz6BtE4mr1GjKNjrNKKSGKw0RsC+wLrQexFsq4bLaCm+n9 QLBuNFeoEXjXuviDGBy/C6AaQwRKSnPIyZ7h+q/uvLJmpenuTqeg9OmpYTFafeYcPV+6 OOG4tBuY6bJ35RCzqTXiH0oB4jLcCHYzIWlCT94oRStrfmsSDNT2reTwpzP5vwWf78UG jVJQ== 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=KnCV625P7lSsc12S8uIRIvIYoTwmPbD/crgffnP4h5U=; b=P7JnypGxe4vB+tMQr+ogieSFENCRSj5SKTSpIeIBDAISZDY6mw+EBWCB36pgOePvgw iWyRzsSUo5xYil2Z2aEELecGPfwsFlwb+MIK0d9FqPpEVrNFhWRsjIGCb/Tum6m1qDuH Afw5KmrZt7m2eYIDubEH5Wo3UbgOwYZPHwbicSpTU7JxJP5vNDXdSr589Kzz1/2TS6KR NFkiIL4KPwfZ2RHCNJj7KeS7HDEu2lh/7Wp1OC74QfY4emmSNfxrqQBXGoATde74zMOQ ke9z80Rzzi6FHdRsSlEm1B1A8tHgPiSWo4WF4WMU7hl0OzfjA/0JbmWxeiCA58cyYQjC UcJQ== X-Gm-Message-State: ALoCoQlzmpZi1XrmFfmLf5W0wvcJLAOhG+WTvPJOfYmPc6xzrGg0X6dNsSZHhCEiej9Bhxg+vEj7t0Mjh371THD3i2MxJBAFuQ== X-Received: by 10.98.67.135 with SMTP id l7mr35720760pfi.148.1452618686647; Tue, 12 Jan 2016 09:11:26 -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 sm8sm40428056pac.43.2016.01.12.09.11.25 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Jan 2016 09:11:25 -0800 (PST) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.local (Postfix, from userid 501) id 7BAAC123BE313; Tue, 12 Jan 2016 09:11:24 -0800 (PST) In-Reply-To: <0mlh7u7nds.fsf@fencepost.gnu.org> (Glenn Morris's message of "Tue, 12 Jan 2016 11:50:39 -0500") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) Mail-Followup-To: 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:198090 Archived-At: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable >>>>> Glenn Morris writes: > In general, almost every non-trivial "skip" in this merge looks wrong to = me. Here is what was skipped: 1 31a97ac Michael Albinus : Merge branch 'emacs-25' of git.sv.gnu.or= g:... 2 e79b06e Paul Eggert : Avoid stdio in SIGINT handler 3 5213ded Jens Lechtenboerger : Refactor mml-smime.el, mml1991.el, mml20= 15.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? =2D-=20 John Wiegley GPG fingerprint =3D 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGcBAEBCgAGBQJWlTO5AAoJEMFE2PTxn+YwzbsMAJJCLnAEft6n2Q0o1dsuWfXL o79HqY6A1EouiuUjPtD/xzLsbsEUDUqRrqCiKPYERFowONrfXxbmClFchED/hb0p 2FGCltr+fq80bi+KHvWrvy4/AaIUJrP1TjUNz6EG0gHiGCpmRLLx063a0d7YNy/Z axl6wF+g31IMmeXID3obNQSuKjYRp7cVVqA24eJ0cP54S3LokJkSbB9SEWRiGWSv wS+YDK4GmsnleNqrDu9gQbh6LxOPlU8LNKTG0wAiwTPmtyxoM5Qmmvd4KYyyo2oL wvLAsOajUIIwbMACtn8lDgeF/QOiSFKPEH4b/Bj8qXBl0+TQXf1IzmlOwn0Z+p0x 8o3a2Ew9KOwm3ywxYtJNWDbQgSBOT0YuFvOiYHxCxTf9h70/XGXstXCLo/Rit5cA XejAnkAtSb94s/h2+5iXjBp67PeVkGP+jZnv+h5iHYlIoidB5HJ50H+T07qsdCv8 bBGOkhUEA76vZhL1Yo8oT6us++HQ5AkFgqgImCk2xA== =k4wp -----END PGP SIGNATURE----- --=-=-=--