From 26b2a4057ff088c5c3f62ec99213a2fe15827276 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Mon, 11 Nov 2024 22:32:24 +0100 Subject: 26.3, 27.2, 28.2: Backport bug-reference fix from 29 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulrich Müller --- emacs/26.3/12_all_bug-reference.patch | 21 +++++++++++++++++++++ emacs/27.2/14_all_bug-reference.patch | 21 +++++++++++++++++++++ emacs/28.2/16_all_bug-reference.patch | 21 +++++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 emacs/26.3/12_all_bug-reference.patch create mode 100644 emacs/27.2/14_all_bug-reference.patch create mode 100644 emacs/28.2/16_all_bug-reference.patch diff --git a/emacs/26.3/12_all_bug-reference.patch b/emacs/26.3/12_all_bug-reference.patch new file mode 100644 index 0000000..5cfd3f9 --- /dev/null +++ b/emacs/26.3/12_all_bug-reference.patch @@ -0,0 +1,21 @@ +Fix bug-reference-fontify +Patch backported from emacs-29 branch +https://debbugs.gnu.org/61395 + +commit 4f053afe8e792c6261d4be0376e2ef0c91353188 +Author: Tassilo Horn +Date: Fri Feb 10 19:22:56 2023 +0100 + + bug-reference: prevent match-data clobbering (bug#61395) + +--- emacs-26.3/lisp/progmodes/bug-reference.el ++++ emacs-26.3/lisp/progmodes/bug-reference.el +@@ -110,7 +110,7 @@ + (re-search-forward bug-reference-bug-regexp end-line 'move)) + (when (or (not bug-reference-prog-mode) + ;; This tests for both comment and string syntax. +- (nth 8 (syntax-ppss))) ++ (nth 8 (save-match-data (syntax-ppss)))) + (let ((overlay (make-overlay (match-beginning 0) (match-end 0) + nil t nil))) + (overlay-put overlay 'category 'bug-reference) diff --git a/emacs/27.2/14_all_bug-reference.patch b/emacs/27.2/14_all_bug-reference.patch new file mode 100644 index 0000000..5ca5b4b --- /dev/null +++ b/emacs/27.2/14_all_bug-reference.patch @@ -0,0 +1,21 @@ +Fix bug-reference-fontify +Patch backported from emacs-29 branch +https://debbugs.gnu.org/61395 + +commit 4f053afe8e792c6261d4be0376e2ef0c91353188 +Author: Tassilo Horn +Date: Fri Feb 10 19:22:56 2023 +0100 + + bug-reference: prevent match-data clobbering (bug#61395) + +--- emacs-27.2/lisp/progmodes/bug-reference.el ++++ emacs-27.2/lisp/progmodes/bug-reference.el +@@ -110,7 +110,7 @@ + (re-search-forward bug-reference-bug-regexp end-line 'move)) + (when (or (not bug-reference-prog-mode) + ;; This tests for both comment and string syntax. +- (nth 8 (syntax-ppss))) ++ (nth 8 (save-match-data (syntax-ppss)))) + (let ((overlay (make-overlay (match-beginning 0) (match-end 0) + nil t nil))) + (overlay-put overlay 'category 'bug-reference) diff --git a/emacs/28.2/16_all_bug-reference.patch b/emacs/28.2/16_all_bug-reference.patch new file mode 100644 index 0000000..654152f --- /dev/null +++ b/emacs/28.2/16_all_bug-reference.patch @@ -0,0 +1,21 @@ +Fix bug-reference-fontify +Patch backported from emacs-29 branch +https://debbugs.gnu.org/61395 + +commit 4f053afe8e792c6261d4be0376e2ef0c91353188 +Author: Tassilo Horn +Date: Fri Feb 10 19:22:56 2023 +0100 + + bug-reference: prevent match-data clobbering (bug#61395) + +--- emacs-28.2/lisp/progmodes/bug-reference.el ++++ emacs-28.2/lisp/progmodes/bug-reference.el +@@ -176,7 +176,7 @@ + (re-search-forward bug-reference-bug-regexp end-line 'move)) + (when (or (not bug-reference-prog-mode) + ;; This tests for both comment and string syntax. +- (nth 8 (syntax-ppss))) ++ (nth 8 (save-match-data (syntax-ppss)))) + (let* ((bounds (bug-reference--overlay-bounds)) + (overlay (or + (let ((ov (pop overlays))) -- cgit v1.2.3-65-gdbad