[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: How to "backport" a patch from master to emacs-28?
From: |
Stefan Monnier |
Subject: |
Re: How to "backport" a patch from master to emacs-28? |
Date: |
Thu, 20 Oct 2022 14:14:00 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) |
> 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örg <haj@posteo.de>
> Date: Wed Nov 3 15:04:10 2021 +0100
>
> ; cperl-mode.el: Fix one match-count in my commit 2021-09-14
>
> * 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) "(")
> ;; '("\\<for\\(each\\)?\\([ \t]+\\(state\\|my\\|local\\|our\\)\\)?[
> \t]*\\(\\$[a-zA-Z_][a-zA-Z_0-9]*\\)[ \t]*("
> - 4 font-lock-variable-name-face)
> + 1 font-lock-variable-name-face)
> ;; Avoid $!, and s!!, qq!! etc. when not fontifying syntactically
> '("\\(?:^\\|[^smywqrx$]\\)\\(!\\)" 1 font-lock-negation-char-face)
> '("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend)))