[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
How to "backport" a patch from master to emacs-28?
From: |
Harald Jörg |
Subject: |
How to "backport" a patch from master to emacs-28? |
Date: |
Thu, 20 Oct 2022 17:54:25 +0000 |
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ö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)))
--
Cheers,
haj
- How to "backport" a patch from master to emacs-28?,
Harald Jörg <=