From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter <jporterbugs@gmail.com> Newsgroups: gmane.emacs.devel Subject: Re: master 9ccaa09a635: ; .dir-locals.el (log-edit-mode) <fill-column>: Set to 64. Date: Wed, 7 Feb 2024 22:13:01 -0800 Message-ID: <62ce63d3-76ce-b511-b2bf-27eb526bb711@gmail.com> References: <170727415485.32408.11264518274307262467@vcs2.savannah.gnu.org> <20240207024915.38686C0EFEC@vcs2.savannah.gnu.org> <CADwFkmmK+r6Q_GdTa++PaZRm3ngQ_ueXR2yfzN8RaS607dUiOg@mail.gmail.com> <87plx74u0i.fsf@yahoo.com> <0e8b1009-1491-2fb7-9efc-c415ed66d334@gmail.com> <87a5ob4ok3.fsf@yahoo.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------lTSC06NkGZVFHc8xriRxgIcT" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4623"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Stefan Kangas <stefankangas@gmail.com>, emacs-devel@gnu.org, eliz@gnu.org To: Po Lu <luangruo@yahoo.com> Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Feb 08 07:13:54 2024 Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org> Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>) id 1rXxfU-0000yl-IO for ged-emacs-devel@m.gmane-mx.org; Thu, 08 Feb 2024 07:13:52 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <emacs-devel-bounces@gnu.org>) id 1rXxen-0001mM-HV; Thu, 08 Feb 2024 01:13:09 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <jporterbugs@gmail.com>) id 1rXxel-0001mD-G3 for emacs-devel@gnu.org; Thu, 08 Feb 2024 01:13:08 -0500 Original-Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <jporterbugs@gmail.com>) id 1rXxej-0001Aj-Lg; Thu, 08 Feb 2024 01:13:07 -0500 Original-Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-1d934c8f8f7so12510925ad.2; Wed, 07 Feb 2024 22:13:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707372783; x=1707977583; darn=gnu.org; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=dbpPe0v2gTYjBgg1sxU8pe6p2KxIkK4FYP9DQeMdCXM=; b=kH+kBqzv/okxQQL/nj7+EXIsPhE35AVvDdpXIWMYCTIuS6IS8Z+EJeGXCJl8CZ4Rs5 4DOB2fNzzlTRqXjwQsFqt1m8287QTtzXV7PD4x3YLTmD6wyFf19VK9ND2otrci7gbhmu F9oPNSk99O4WOd8Dz6RyQzyz6yOkotKuC1ATpwPZc5kZvgZQRRSVPi4+/CA0234mIlxt Bu0HBbA/fOzg32jNJasny6NYerofvfBqAJEgg7HvYg9RS9+u6dkbesfud8p3A6Hj8Ftx 7wXuBZXgqHRDCRDPhry6KEw/vxEET3Sjowgg/ZbpEZi17NAodAVuOHHBHg30BKzRDs51 hTqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707372783; x=1707977583; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=dbpPe0v2gTYjBgg1sxU8pe6p2KxIkK4FYP9DQeMdCXM=; b=Ei7DWg15zPmX5eROdoJ8iO8bJBaaAqc5j/141vdpc77LOLGV9lh5F0Jjd3LMRqDH2t zmx4PxglnUVBOTGjPLwMKlzNgwOWHVtPHzpqqhZHCczQ6zbRqoP0lygYgEsINUfKKHTB 1d9XW2LpTrxFKr9ppiTm+zR7g5eJ25m4jf0JGPaQ3mSMiygB+UNoa5xDhVv5ngJocg04 XdBmlwg2hWCyw+AfHpbj9ELFnnc5UCyv63cV2M2dG/S/f3vLY+z5itLCrGcNrXcwxqgk uqTTQ5Q4i0M9lWJ/9JrMEnrbNeupJsrRY+ssRDOv4Sw1F5iH1sx166C7e0s7dyCJhNKv +n9w== X-Forwarded-Encrypted: i=1; AJvYcCWBCAZshkbtI+zBTIWh7ES3PAYNwIra6v9ZXpa/x75VENNoWQ97jmtHT2n0ZbAwMpa7TU68bLoGFwVmNrfeB69zDKl2P/DFGPSxCOrjmhkakwQ= X-Gm-Message-State: AOJu0Yz49PuwzN3Cm5qVbVI/02bESLcynOgPXCDLjI8sfeFx9XDl8RXF 9qcy8kXuc+UNZ2ZZesm99kioY7LW00h1fy+Z/Lz3ZN0xS4BP1Hk9 X-Google-Smtp-Source: AGHT+IH75l4Q/tLww9V/Dw9o4mK0ubufCIH3af8fnkveEw3Nzn3eGLPj6/t6b4qofUZGAzkpzYtd5A== X-Received: by 2002:a17:902:f54a:b0:1d9:732e:8fe6 with SMTP id h10-20020a170902f54a00b001d9732e8fe6mr8417001plf.16.1707372783075; Wed, 07 Feb 2024 22:13:03 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWXprzqu5l2+ok8cDyUs9kCUqcPjq+Nvs4P3HDb+sZIISPcifJxF4NqQwqTyDzlcPaQKz2bxF35P4EIJH9gdFuPAUEi+Mi26U3kFOnGVnAnRrw= Original-Received: from [192.168.1.2] (076-168-148-233.res.spectrum.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id lh5-20020a170903290500b001d706e373a9sm2515293plb.292.2024.02.07.22.13.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 07 Feb 2024 22:13:01 -0800 (PST) Content-Language: en-US In-Reply-To: <87a5ob4ok3.fsf@yahoo.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=jporterbugs@gmail.com; helo=mail-pl1-x629.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." <emacs-devel.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>, <mailto:emacs-devel-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/emacs-devel> List-Post: <mailto:emacs-devel@gnu.org> List-Help: <mailto:emacs-devel-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>, <mailto:emacs-devel-request@gnu.org?subject=subscribe> Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:316017 Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/316017> This is a multi-part message in MIME format. --------------lTSC06NkGZVFHc8xriRxgIcT Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/7/2024 7:34 PM, Po Lu wrote: > Jim Porter <jporterbugs@gmail.com> writes: > >> I don't have a terribly strong opinion here of what number to use, but >> we should at least resolve the inconsistencies in CONTRIBUTE, >> .dir-locals.el, and build-aux/git-hooks/commit-msg. > > commit-msg is fine as-is, but CONTRIBUTE should be fixed. I think I understand now. I find the CONTRIBUTE explanation rather confusing to be honest, since it introduces ChangeLog files, mentions ChangeLog entries in that context (which I interpret as "one commit message -> one ChangeLog entry"), and then later talks about ChangeLog entries again, but in the context of the commit message (where I interpret it to mean "one ChangeLog entry = one file/function changed"). Only after reading this a few times in detail did I notice this distinction. I've attached a patch with a proposed change in that section (I'll defer to others on fixing the numeric values as needed) that I feel is clearer. In particular, I merged two paragraphs that described when to add a descriptive paragraph to the commit message, and I used "file entry" to talk about what the previous version called "ChangeLog entries" in the second sense I mentioned above. No worries if this doesn't get merged, or if people change my wording. I just thought it would be helpful to show an example of what I'd find clearer. --------------lTSC06NkGZVFHc8xriRxgIcT Content-Type: text/plain; charset=UTF-8; name="0001-CONTRIBUTE-Commit-messages-Improve-wording-about-fil.patch" Content-Disposition: attachment; filename*0="0001-CONTRIBUTE-Commit-messages-Improve-wording-about-fil.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA1MWE3MzQxYjQzNDYwY2ExYTAzNjQxMTEwM2ExMGE2NmU3OWU5ZTczIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFdlZCwgNyBGZWIgMjAyNCAyMjowODowOCAtMDgwMApTdWJqZWN0OiBbUEFU Q0hdICogQ09OVFJJQlVURSAoQ29tbWl0IG1lc3NhZ2VzKTogSW1wcm92ZSB3b3JkaW5nIGFi b3V0IGZpbGUKIGVudHJpZXMuCgotLS0KIENPTlRSSUJVVEUgfCAyOSArKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDE0 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0NPTlRSSUJVVEUgYi9DT05UUklCVVRFCmlu ZGV4IDcwYjk3NjBiYjk5Li5jOTQyYmZiM2I4YiAxMDA2NDQKLS0tIGEvQ09OVFJJQlVURQor KysgYi9DT05UUklCVVRFCkBAIC0yMDAsMTUgKzIwMCwyMSBAQCB0aGVtIHJpZ2h0IHRoZSBm aXJzdCB0aW1lLCBzbyBoZXJlIGFyZSBndWlkZWxpbmVzIGZvciBmb3JtYXR0aW5nIHRoZW06 CiAKIC0gQWZ0ZXIgdGhlIHN1bW1hcnkgbGluZSwgdGhlcmUgc2hvdWxkIGJlIGFuIGVtcHR5 IGxpbmUuCiAKLS0gVW5pbmRlbnRlZCBDaGFuZ2VMb2cgZW50cmllcyBub3JtYWxseSBjb21l IG5leHQuICBIb3dldmVyLCBpZiB0aGUKLSAgY29tbWl0IGNvdWxkbid0IGJlIHByb3Blcmx5 IHN1bW1hcml6ZWQgaW4gdGhlIGJyaWVmIHN1bW1hcnkgbGluZSwKLSAgeW91IGNhbiBwdXQg YSBwYXJhZ3JhcGggKGFmdGVyIHRoZSBlbXB0eSBsaW5lIGFuZCBiZWZvcmUgdGhlCi0gIGlu ZGl2aWR1YWwgQ2hhbmdlTG9nIGVudHJpZXMpIHRoYXQgZnVydGhlciBkZXNjcmliZXMgdGhl IGNvbW1pdC4KLQotLSBMaW5lcyBpbiBDaGFuZ2VMb2cgZW50cmllcyBzaG91bGQgcHJlZmVy YWJseSBiZSBub3QgbG9uZ2VyIHRoYW4gNjMKLSAgY2hhcmFjdGVycywgYW5kIG11c3Qgbm90 IGV4Y2VlZCA3OCBjaGFyYWN0ZXJzLCB1bmxlc3MgdGhleSBjb25zaXN0Ci0gIG9mIGEgc2lu Z2xlIHdvcmQgb2YgYXQgbW9zdCAxNDAgY2hhcmFjdGVyczsgdGhpcyA3OC8xNDAgbGltaXQg aXMKLSAgZW5mb3JjZWQgYnkgYSBjb21taXQgaG9vay4KKy0gSWYgbmVjZXNzYXJ5LCBhIHBh cmFncmFwaCBkZXNjcmliaW5nIHRoZSBjb21taXQgaW4gbW9yZSBkZXRhaWwgY29tZXMKKyAg bmV4dC4gIEV4cGxhaW5pbmcgdGhlIHJhdGlvbmFsZSBmb3IgYSBkZXNpZ24gY2hvaWNlIGlz IGJlc3QgZG9uZSBpbgorICBjb21tZW50cyBpbiB0aGUgc291cmNlIGNvZGUuICBIb3dldmVy LCBzb21ldGltZXMgaXQgaXMgdXNlZnVsIHRvCisgIGRlc2NyaWJlIGp1c3QgdGhlIHJhdGlv bmFsZSBmb3IgYSBjaGFuZ2U7IHRoYXQgY2FuIGJlIGRvbmUgaW4gdGhpcworICBwYXJhZ3Jh cGguICBJZiB5b3UgaW5jbHVkZSB0aGlzIHBhcmFncmFwaCwgdGhlcmUgc2hvdWxkIGJlIGFu b3RoZXIKKyAgZW1wdHkgbGluZSBhZnRlciBpdC4KKworLSBGaWxlIGVudHJpZXMgY29tZSBu ZXh0LiAgVGhlc2UgYmVnaW4gd2l0aCBhICIqICIgZm9sbG93ZWQgYnkgdGhlCisgIGZpbGUn cyBuYW1lLCB0aGUgZnVuY3Rpb24gb3Igc2VjdGlvbiB0aGF0IHdhcyBjaGFuZ2VkIGluIHBh cmVudGhlc2VzLAorICBhICI6ICIsIGFuZCB0aGVuIGEgc2hvcnQgZGVzY3JpcHRpb24gb2Yg dGhlIGNoYW5nZS4KKworLSBMaW5lcyBpbiB0aGUgZGV0YWlsZWQgcGFyYWdyYXBoIGFuZCBm aWxlIGVudHJpZXMgc2hvdWxkIHByZWZlcmFibHkgYmUKKyAgbm90IGxvbmdlciB0aGFuIDYz IGNoYXJhY3RlcnMsIGFuZCBtdXN0IG5vdCBleGNlZWQgNzggY2hhcmFjdGVycywKKyAgdW5s ZXNzIHRoZXkgY29uc2lzdCBvZiBhIHNpbmdsZSB3b3JkIG9mIGF0IG1vc3QgMTQwIGNoYXJh Y3RlcnM7IHRoaXMKKyAgNzgvMTQwIGxpbWl0IGlzIGVuZm9yY2VkIGJ5IGEgY29tbWl0IGhv b2suCiAKIC0gSWYgb25seSBhIHNpbmdsZSBmaWxlIGlzIGNoYW5nZWQsIHRoZSBzdW1tYXJ5 IGxpbmUgY2FuIGJlIHRoZSBub3JtYWwKICAgZmlsZSBmaXJzdCBsaW5lIChzdGFydGluZyB3 aXRoIHRoZSBhc3RlcmlzaykuICBUaGVuIHRoZXJlIGlzIG5vCkBAIC0yNDAsMTEgKzI0Niw2 IEBAIHRoZW0gcmlnaHQgdGhlIGZpcnN0IHRpbWUsIHNvIGhlcmUgYXJlIGd1aWRlbGluZXMg Zm9yIGZvcm1hdHRpbmcgdGhlbToKIC0gQW55IGxpbmVzIG9mIHRoZSBjb21taXQgbWVzc2Fn ZSB0aGF0IHN0YXJ0IHdpdGggIjsgIiBhcmUgb21pdHRlZAogICBmcm9tIHRoZSBnZW5lcmF0 ZWQgQ2hhbmdlTG9nLgogCi0tIEV4cGxhaW5pbmcgdGhlIHJhdGlvbmFsZSBmb3IgYSBkZXNp Z24gY2hvaWNlIGlzIGJlc3QgZG9uZSBpbiBjb21tZW50cwotICBpbiB0aGUgc291cmNlIGNv ZGUuICBIb3dldmVyLCBzb21ldGltZXMgaXQgaXMgdXNlZnVsIHRvIGRlc2NyaWJlIGp1c3QK LSAgdGhlIHJhdGlvbmFsZSBmb3IgYSBjaGFuZ2U7IHRoYXQgY2FuIGJlIGRvbmUgaW4gdGhl IGNvbW1pdCBtZXNzYWdlCi0gIGJldHdlZW4gdGhlIHN1bW1hcnkgbGluZSBhbmQgdGhlIGZp bGUgZW50cmllcy4KLQogLSBFbWFjcyBnZW5lcmFsbHkgZm9sbG93cyB0aGUgR05VIGNvZGlu ZyBzdGFuZGFyZHMgZm9yIENoYW5nZUxvZ3M6IHNlZQogICBodHRwczovL3d3dy5nbnUub3Jn L3ByZXAvc3RhbmRhcmRzL2h0bWxfbm9kZS9DaGFuZ2UtTG9ncy5odG1sCiAgIG9yIHJ1biAn aW5mbyAiKHN0YW5kYXJkcylDaGFuZ2UgTG9ncyInLiAgT25lIGV4Y2VwdGlvbiBpcyB0aGF0 Ci0tIAoyLjI1LjEKCg== --------------lTSC06NkGZVFHc8xriRxgIcT--