From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: How to "backport" a patch from master to emacs-28? Date: Thu, 20 Oct 2022 14:14:00 -0400 Message-ID: References: <87zgdqpei6.fsf@vdesktop> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2235"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: Emacs Developer List To: Harald =?windows-1252?Q?J=F6rg?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Oct 20 20:15:56 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 1ola5D-0000H3-Pb for ged-emacs-devel@m.gmane-mx.org; Thu, 20 Oct 2022 20:15:55 +0200 Original-Received: from localhost ([::1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ola5C-0007n5-OX for ged-emacs-devel@m.gmane-mx.org; Thu, 20 Oct 2022 14:15:54 -0400 Original-Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ola3a-000796-2v for ged-emacs-devel@m.gmane-mx.org; Thu, 20 Oct 2022 14:14:14 -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 1ola3V-00078B-FI for emacs-devel@gnu.org; Thu, 20 Oct 2022 14:14:09 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ola3R-0004Qd-0Q for emacs-devel@gnu.org; Thu, 20 Oct 2022 14:14:06 -0400 Original-Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 6EC69100622; Thu, 20 Oct 2022 14:14:03 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id ABCE4100117; Thu, 20 Oct 2022 14:14:01 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1666289641; bh=K0hCrCKa9IYqzK98jSvtkDrX2rHbh+a0NSiSBeeqNQM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=K/FzC5Afkqzdzfk2ZOIobtR0HcDn5sTaOz/WatB6NkNDKlrGgM7J4T+NO08H+udsK bUHPzYW2VVqhxJJz2I71wYiwE560rYccETxoRWNl6eRbzFT+1n+UQuPk7JbJuwiTk/ wAEYBr9WG/NSRorEs2w8aBI/qzLV1dgqoTIu/mFapx5i2lav1FMvvPxzBygnJYdREX PE3I7D0YYQoHmLfMPcZ+KTmHxwJyaIN3gcL2B09IUSyJjmT9vZrLPyYWPkbtKYl43x ACKjjjTZ1DwM7sVC+XR1daPW88+Kz1/lbgQjLpsjTBibLsTThBe4vX7cPX6frqQ5l2 Hb0drVC7Vb9vA== Original-Received: from lechazo (lechon.iro.umontreal.ca [132.204.27.242]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 5CE9B1200A5; Thu, 20 Oct 2022 14:14:01 -0400 (EDT) In-Reply-To: <87zgdqpei6.fsf@vdesktop> ("Harald =?windows-1252?Q?J=F6rg=22?= =?windows-1252?Q?'s?= message of "Thu, 20 Oct 2022 17:54:25 +0000") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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:298168 Archived-At: > 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. Yes, that can be done, indeed. But please mark it as a "backport". Or use `git cherry-pick` which should label it similarly. This should make sure that the next time we merge from emacs-28 back to `master`, `gitmerge.el` can automatically skip it to avoid spurious conflicts. Note also that AFAIK there is currently no plan for an Emacs-28.3 (we're instead planning to cut the `emacs-29` branch soon, tho there'll still be many months before the Emacs-29.1 release). Stefan > commit a25e91593d48a541b5940a2ed707ddfaef5c953f > Author: Harald J=F6rg > 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=20 > * lisp/progmodes/cperl-mode.el (cperl-init-faces): Matching group nee= ds > 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) "(") > ;; '("\\ - 4 font-lock-variable-name-face) > + 1 font-lock-variable-name-face) > ;; Avoid $!, and s!!, qq!! etc. when not fontifying syntactic= ally > '("\\(?:^\\|[^smywqrx$]\\)\\(!\\)" 1 font-lock-negation-char-= face) > '("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend)))