From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: Question about intended behavior of 'insert-for-yank-1'. Date: Tue, 04 Oct 2016 16:04:57 -0500 Message-ID: <87wphnltae.fsf@red-bean.com> References: <874m5lr92d.fsf@red-bean.com> <83eg4p9hqk.fsf@gnu.org> <87inu1ghud.fsf@red-bean.com> <83y42x7yud.fsf@gnu.org> <87poo8g2zi.fsf@red-bean.com> <7abf7a00-3f17-4ef6-bfbd-0f5df4e7acd6@default> <87twcutfqe.fsf@red-bean.com> <83twcuorrq.fsf@gnu.org> <87oa31qm22.fsf@red-bean.com> <83shscodl1.fsf@gnu.org> <87fuocnhb2.fsf@red-bean.com> <837f9om0yt.fsf@gnu.org> Reply-To: Karl Fogel NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1475615196 14675 195.159.176.226 (4 Oct 2016 21:06:36 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 4 Oct 2016 21:06:36 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) Cc: drew.adams@oracle.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 04 23:06:32 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1brWun-0001dt-EM for ged-emacs-devel@m.gmane.org; Tue, 04 Oct 2016 23:06:17 +0200 Original-Received: from localhost ([::1]:45292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brWum-0001pN-32 for ged-emacs-devel@m.gmane.org; Tue, 04 Oct 2016 17:06:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brWtc-0001DM-89 for emacs-devel@gnu.org; Tue, 04 Oct 2016 17:05:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brWtX-0001IL-PC for emacs-devel@gnu.org; Tue, 04 Oct 2016 17:05:03 -0400 Original-Received: from mail-io0-x22b.google.com ([2607:f8b0:4001:c06::22b]:33572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brWtX-0001I5-KJ; Tue, 04 Oct 2016 17:04:59 -0400 Original-Received: by mail-io0-x22b.google.com with SMTP id q192so1340302iod.0; Tue, 04 Oct 2016 14:04:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:reply-to:date:in-reply-to :message-id:user-agent:mime-version; bh=ETJbC3yc0mfxWoiIUniTQXRxLJ6ovZ07rB7r34RnNrk=; b=jkZglVdAu+44NiL1x5HeNFJVpuXtOWXB7w2aDheTxaAyWOvfgk/ZgdvpE2xm7ifDYQ agL6Gq062q/ddxHJuxOFhAeAl9cl2EdXMvUyNU5+kj+vEd/kyI4sAb1rIBjBkzU5jYta bC8vn62sfLysRjWiyoOZHYteSmhz8ebRZVzVVEVHRrqnMljxfmvxrB0pZsh1oROAdalJ 20uSQUNXyBluSOSkVj0zRyiyaBBaBqEEuddHGreq0oSj7+wmKOzI7AoxJvUi4hqmUMDZ GVDGkwmjWBEKOJSBvx3pQMff/Vd3yV8NuzxzdrEJKaGBDL3Tz3roVOzUHswL8W+jtzLM Dqcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:references:reply-to :date:in-reply-to:message-id:user-agent:mime-version; bh=ETJbC3yc0mfxWoiIUniTQXRxLJ6ovZ07rB7r34RnNrk=; b=aGL7wPXC3lv3dzblpCftxv+dvsPrBWxNzKur6ziJVlnHca5Ls+3GBOs8P96yNGUxqO dGAgfIwtlWGPur7d9ifxpZRu5vOEGnfdRkIMtFiOpcKkgB4eZj90gT3KpK3Grji+vwNP CIxUZSR/qJ0VAxlLer48oHoEZUJvHIFE28ntrru8mIgdasd30mFAnOTm6D6Cn3SIPzYO djYEWCt7CZHjx+tMcsUkxH4uCGue2Yq1uapimsVgbcfStUqhNinsDreNHFH/lebWQu7I hqOrEFLbTCnfAOw0ikjqNnIj4ehro1FDeCDdUFbpKm1ipns/6W7XUZWcGOAijqvJC8Zc Kcrw== X-Gm-Message-State: AA6/9RmNJ4kGMD2OlcIrEADidVfxPUVcDNVeVYD9BszrG08xlvSO2oQj/txOcj44fClsfA== X-Received: by 10.107.29.130 with SMTP id d124mr6299167iod.61.1475615099004; Tue, 04 Oct 2016 14:04:59 -0700 (PDT) Original-Received: from kwork (74-92-190-114-Illinois.hfc.comcastbusiness.net. [74.92.190.114]) by smtp.gmail.com with ESMTPSA id h90sm2328491iod.18.2016.10.04.14.04.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Oct 2016 14:04:58 -0700 (PDT) In-Reply-To: <837f9om0yt.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 04 Oct 2016 21:19:06 +0300") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4001:c06::22b X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:207987 Archived-At: Eli Zaretskii writes: >> From: Karl Fogel >> Cc: drew.adams@oracle.com, emacs-devel@gnu.org >> Date: Tue, 04 Oct 2016 12:40:49 -0500 >> >> >You need to understand the logic behind the instructions in >> >CONTRIBUTE: the release branch should only get fixes that are either >> >necessary, or are safe, i.e. cannot possibly break the release. And >> >doc changes obviously belong to this latter class. >> >> I understand that logic. However, do you mean s/only/always/ above? > >I don't see the difference. "Only" means "always" in this case. Ah, I see what happened, I think. This is just an English usage issue. In this context, a native speaker would (usually) interpret "only" as meaning: "the only circumstances under which you should commit a fix to a release branch are XYZ". But you meant it like this: "in circumstances XYZ, you should commit only to the release branch, and not to the master branch". If you take your original sentence and substitute "always" for "only", it will convey what you intended it to mean. >> But I don't know that for sure, and CONTRIBUTE doesn't say. Maybe >> this is just a doc bug in CONTRIBUTE and we should fix it. > >CONTRIBUTE already does say that, I made the change there today. I clarified in commit 4b347fe5 (on emacs-25) that this applies even when the release branch is in feature freeze. Now there can be no misunderstanding. Thanks, -Karl