From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?Harald_J=C3=B6rg?= Newsgroups: gmane.emacs.devel Subject: How to "backport" a patch from master to emacs-28? Date: Thu, 20 Oct 2022 17:54:25 +0000 Message-ID: <87zgdqpei6.fsf@vdesktop> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3061"; mail-complaints-to="usenet@ciao.gmane.io" To: Emacs Developer List Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Oct 20 19:54:43 2022 Return-path: 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 ) id 1olZkh-0000Zs-Cp for ged-emacs-devel@m.gmane-mx.org; Thu, 20 Oct 2022 19:54:43 +0200 Original-Received: from localhost ([::1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olZke-0002Pt-Ko for ged-emacs-devel@m.gmane-mx.org; Thu, 20 Oct 2022 13:54:40 -0400 Original-Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olZkc-0001qC-4K for ged-emacs-devel@m.gmane-mx.org; Thu, 20 Oct 2022 13:54:38 -0400 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 ) id 1olZkT-0000wy-IV for emacs-devel@gnu.org; Thu, 20 Oct 2022 13:54:29 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olZkR-0008DT-DZ for emacs-devel@gnu.org; Thu, 20 Oct 2022 13:54:29 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0750A240104 for ; Thu, 20 Oct 2022 19:54:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1666288464; bh=AtB9Pcwyd29yO042+5F+baXpDVH7gO/ZTWUw4Ypcp08=; h=From:To:Subject:Date:From; b=p6iHRIvW8VUImUSJ7laI892VM01ZMDIrOCNcHrOTCh2hReuRoOR1epZrwbit+6v7v YOxrd08rH5jPDgEO3QbpZ0u+bDd90EddjHCXtjdPE6k85ch1UgHJ+Gwjpyrg+6Uphz r3pa4qs+x8kDqNLAjA9fh/scoZjx8sgKbkSuusgCx8E5He5T9O/6APCGvMYeviLkYC eweT27csZ16xUch6+EVCaz2hmLZSCYN0u36f/hRx2aUzNxoPT66/X7aXIdW7ml/MXm D3CcQLuRVgghYj0MOelksa9uLiVoHi0XpPEb55s0zblHV9GH931NPCUhalXxBt6hhu 9D2EHVaRqfUnA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MtZwv420Qz9rxN for ; Thu, 20 Oct 2022 19:54:23 +0200 (CEST) Received-SPF: pass client-ip=185.67.36.66; envelope-from=haj@posteo.de; helo=mout02.posteo.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:298163 Archived-At: Hello Emacs developers, I made two mistakes: The first was a simple software bug in a commit to Emacs master in September 2021. The second mistake was to fix the bug in master in November 2021: This fix is not in Emacs 28.2, and it is not in the emacs-28 branch. This was brought to my attention by an Emacs user via the now-retired fork of CPerl mode in https://github.com/jrockway/cperl-mode/issues/59. I understand that the usual procedure is to merge _from_ the release branches _to_ master, but that ship has sailed. Is it ok to cherry-pick the single commit and push it to emacs-28? It is a trivial patch, below is what "git show" has to say. commit a25e91593d48a541b5940a2ed707ddfaef5c953f Author: Harald J=C3=B6rg Date: Wed Nov 3 15:04:10 2021 +0100 ; cperl-mode.el: Fix one match-count in my commit 2021-09-14 =20=20=20=20 * lisp/progmodes/cperl-mode.el (cperl-init-faces): Matching group needs to be adjusted according to the regexp change in my previous commit diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 1afeb60ac5..a23505a9d3 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -5951,7 +5951,7 @@ cperl-init-faces (eval cperl--basic-identifier-rx))) (0+ blank) "(") ;; '("\\