aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2024-06-24 17:10:54 +0200
committerUlrich Müller <ulm@gentoo.org>2024-06-24 17:10:54 +0200
commit4ea8869a86bcd567420785dc0e75709aa3d1a504 (patch)
tree7092f31184edf629727e50c90d5f250c8e2a5aea
parent29.3: Backport org-mode fix from 29.4 (diff)
downloademacs-patches-master.tar.gz
emacs-patches-master.tar.bz2
emacs-patches-master.zip
29.3, 29.4: Fix test failure with GCC 14HEADemacs-29.4-patches-2emacs-29.3-patches-4master
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--emacs/29.3/06_all_flymake-gcc-14.patch15
-rw-r--r--emacs/29.4/04_all_flymake-gcc-14.patch15
2 files changed, 30 insertions, 0 deletions
diff --git a/emacs/29.3/06_all_flymake-gcc-14.patch b/emacs/29.3/06_all_flymake-gcc-14.patch
new file mode 100644
index 0000000..5167d21
--- /dev/null
+++ b/emacs/29.3/06_all_flymake-gcc-14.patch
@@ -0,0 +1,15 @@
+Fix flymake tests with GCC 14
+https://debbugs.gnu.org/71749
+
+--- emacs-29.3/test/lisp/progmodes/flymake-tests.el
++++ emacs-29.3/test/lisp/progmodes/flymake-tests.el
+@@ -174,7 +174,8 @@
+ (flymake-tests--with-flymake
+ ("some-problems.h")
+ (flymake-goto-next-error)
+- (should (eq 'flymake-warning (face-at-point)))
++ ;; implicit-int was promoted from warning to error in GCC 14
++ (should (memq (face-at-point) '(flymake-warning flymake-error)))
+ (flymake-goto-next-error)
+ (should (eq 'flymake-error (face-at-point)))
+ (should-error (flymake-goto-next-error nil nil t)))
diff --git a/emacs/29.4/04_all_flymake-gcc-14.patch b/emacs/29.4/04_all_flymake-gcc-14.patch
new file mode 100644
index 0000000..5167d21
--- /dev/null
+++ b/emacs/29.4/04_all_flymake-gcc-14.patch
@@ -0,0 +1,15 @@
+Fix flymake tests with GCC 14
+https://debbugs.gnu.org/71749
+
+--- emacs-29.3/test/lisp/progmodes/flymake-tests.el
++++ emacs-29.3/test/lisp/progmodes/flymake-tests.el
+@@ -174,7 +174,8 @@
+ (flymake-tests--with-flymake
+ ("some-problems.h")
+ (flymake-goto-next-error)
+- (should (eq 'flymake-warning (face-at-point)))
++ ;; implicit-int was promoted from warning to error in GCC 14
++ (should (memq (face-at-point) '(flymake-warning flymake-error)))
+ (flymake-goto-next-error)
+ (should (eq 'flymake-error (face-at-point)))
+ (should-error (flymake-goto-next-error nil nil t)))