Merge from origin/emacs-28

69e82968d7 Fix integer arithmetic miss-compilation (bug#53451)
31af9bca99 Mark flymake as compatible with emacs-26.1

1 files changed, 8 insertions, 1 deletions

diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
index 89cb3d153d8..212d9e999f2 100644
--- a/test/src/comp-tests.el
+++ b/test/src/comp-tests.el
@@ -1369,7 +1369,14 @@ Return a list of results."
          (when (eql x 1.0)
            (error ""))
          x)
-       t)))
+       t)
+
+      ;; 74
+      ((defun comp-tests-ret-type-spec-f (x)
+         (if (eq x 0)
+             (error "")
+           (1+ x)))
+       number)))
 
   (defun comp-tests-define-type-spec-test (number x)
     `(comp-deftest ,(intern (format "ret-type-spec-%d" number)) ()