diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2024-11-11 22:32:24 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2024-11-11 22:32:24 +0100 |
| commit | 26b2a4057ff088c5c3f62ec99213a2fe15827276 (patch) | |
| tree | d4259954384fa4ff6679a412c10f32f2668ef87a | |
| parent | 29.4: Add reference to upstream bug (diff) | |
| download | emacs-patches-26b2a4057ff088c5c3f62ec99213a2fe15827276.tar.gz emacs-patches-26b2a4057ff088c5c3f62ec99213a2fe15827276.tar.bz2 emacs-patches-26b2a4057ff088c5c3f62ec99213a2fe15827276.zip | |
26.3, 27.2, 28.2: Backport bug-reference fix from 29HEADemacs-28.2-patches-9emacs-27.2-patches-11emacs-26.3-patches-10master
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
| -rw-r--r-- | emacs/26.3/12_all_bug-reference.patch | 21 | ||||
| -rw-r--r-- | emacs/27.2/14_all_bug-reference.patch | 21 | ||||
| -rw-r--r-- | emacs/28.2/16_all_bug-reference.patch | 21 |
3 files changed, 63 insertions, 0 deletions
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 <tsdh@gnu.org> +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 <tsdh@gnu.org> +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 <tsdh@gnu.org> +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))) |