From 09a9fee9816e4d2e65b17e867afc2b11ae0e23d7 Mon Sep 17 00:00:00 2001
From: Philipp Stephani <p.stephani2@gmail.com>
Date: Tue, 25 Aug 2026 16:34:40 +0200
Subject: [PATCH] Remove Emacs 29 workarounds

---
 elisp/private/tools/compile.el |  9 +----
 elisp/private/tools/run-tst.el | 69 ++++++++++++++--------------------
 2 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/elisp/private/tools/compile.el b/elisp/private/tools/compile.el
index 1e89f4f35..a44ebb8a1 100644
--- a/elisp/private/tools/compile.el
+++ b/elisp/private/tools/compile.el
@@ -1,6 +1,6 @@
 ;;; compile.el --- byte-compile Emacs Lisp files     -*- lexical-binding: t; -*-
 
-;; Copyright 2020-2025 Google LLC
+;; Copyright 2020-2026 Google LLC
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@@ -42,13 +42,6 @@
 (setq byte-compile-root-dir
       (file-name-quote (expand-file-name default-directory)))
 
-;; Emacs 29 doesn’t yet support the ‘ftype’ declaration.  Ensure that
-;; compilation works without warnings.
-(dolist (var '(defun-declarations-alist macro-declarations-alist))
-  (let ((value (symbol-value var)))
-    (unless (assq 'ftype value)
-      (set var (cons '(ftype ignore) value)))))
-
 (cl-destructuring-bind (fatal-warn current-repo src out) command-line-args-left
   (let ((file-name-handler-alist ()))
     (cl-flet ((quote-file (file) (concat "/:" (expand-file-name file))))
diff --git a/elisp/private/tools/run-tst.el b/elisp/private/tools/run-tst.el
index 2ef5c4dc0..c86f4f986 100644
--- a/elisp/private/tools/run-tst.el
+++ b/elisp/private/tools/run-tst.el
@@ -328,55 +328,52 @@ Return FORM."
     (@instrument-form seen nil form))
   form)
 
-;; Emacs 29 incorrectly warns about overly long docstrings in generated code.
-;; FIXME: Remove suppression once we drop support for Emacs 29.
-(with-suppressed-warnings ((docstrings nil))
-  (cl-defstruct (@coverage-data
-                 (:constructor @make-coverage-data)
-                 (:copier nil))
-    "Coverage data for a specific form.
+(cl-defstruct (@coverage-data
+               (:constructor @make-coverage-data)
+               (:copier nil))
+  "Coverage data for a specific form.
 The ‘edebug-after-instrumentation-function’ initializes the ‘@coverage’
 property of each instrumented symbol to a vector.  Some elements of the
 vector will be objects of this type."
-    (hits
-     0
-     :type natnum
-     :documentation "Number of times this form was hit.")
-    (branches
-     nil
-     :type (or null vector)
-     :documentation "Nil if the underlying form doesn’t have
+  (hits
+   0
+   :type natnum
+   :documentation "Number of times this form was hit.")
+  (branches
+   nil
+   :type (or null vector)
+   :documentation "Nil if the underlying form doesn’t have
 multiple branches.  Otherwise, a vector of per-branch hit counts.
 If a branch can’t be instrumented, the corresponding element is
 nil.")
-    (parent-branches
-     nil
-     :type (or null vector)
-     :documentation "Nil if the underlying form is neither a
+  (parent-branches
+   nil
+   :type (or null vector)
+   :documentation "Nil if the underlying form is neither a
 branching condition nor a child form of a branching form.
 Otherwise, a reference to the ‘branches’ property of the coverage
 data of the corresponding branching form.")
-    (branch-index
-     nil
-     :type (or null natnum)
-     :documentation "Index into the ‘parent-branches’ vector
+  (branch-index
+   nil
+   :type (or null natnum)
+   :documentation "Index into the ‘parent-branches’ vector
 specifying the element that should be incremented whenever the
 underlying form is hit.  Nil if no branch element should be
 incremented.")
-    (then-index
-     nil
-     :type (or null natnum)
-     :documentation "Index into the ‘parent-branches’ vector
+  (then-index
+   nil
+   :type (or null natnum)
+   :documentation "Index into the ‘parent-branches’ vector
 specifying the element that should be incremented whenever the
 underlying form finishes successfully with a non-nil value.  Nil
 if no branch element should be incremented.")
-    (else-index
-     nil
-     :type (or null natnum)
-     :documentation "Index into the ‘parent-branches’ vector
+  (else-index
+   nil
+   :type (or null natnum)
+   :documentation "Index into the ‘parent-branches’ vector
 specifying the element that should be incremented whenever the
 underlying form finishes successfully with a non-nil value.  Nil
-if no branch element should be incremented.")))
+if no branch element should be incremented."))
 
 (defun @instrument-form (seen vector form)
   "Instrument FORM to collect line coverage information.
@@ -1118,14 +1115,6 @@ exact copies as equal."
                                :test #'@file-equal-p))
              (push (@load-instrument fullname file) load-buffers)
              t))))
-      ;; Work around another Edebug specification issue fixed with Emacs commit
-      ;; c799ad42f705f64975771e181dee29e1d0ebe97a.
-      (when (eql emacs-major-version 29)
-        (with-eval-after-load 'cl-macs
-          (put #'cl-define-compiler-macro 'edebug-form-spec
-               '(&define [&name symbolp "@cl-compiler-macro"]
-                         cl-macro-list
-                         cl-declarations-or-string def-body))))
       (when reporter (progress-reporter-done reporter))))
 
   ;; Load test source files.  If coverage is enabled, check for a file with a