From 17c62c1242faeab030d4b0d05dc00cc8c3d8ae5f Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 15 Jul 2024 19:25:42 +0200
Subject: [PATCH 1/3] Rename treesitter test

* test/lisp/align-tests.el (align-ts-lua): Rename test in order to
fit to treesitter tests on EMBA.
---
 test/lisp/align-tests.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/lisp/align-tests.el b/test/lisp/align-tests.el
index eaebaf8360c..486658a9523 100644
--- a/test/lisp/align-tests.el
+++ b/test/lisp/align-tests.el
@@ -51,7 +51,7 @@
 
 (autoload 'treesit-ready-p "treesit")
 
-(ert-deftest align-lua ()
+(ert-deftest align-ts-lua ()
   (skip-unless (treesit-ready-p 'lua t))
   (let ((comment-column 20)
         (indent-tabs-mode nil))

From fc25b4d8370a7c3d24b4c1335babfa1a66fe45dd Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Mon, 15 Jul 2024 22:59:50 +0200
Subject: [PATCH 2/3] * etc/TODO: Refer to Bug#72127 for Magit assignments.

---
 etc/TODO | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/etc/TODO b/etc/TODO
index 53b456c733a..52dd26b4e8f 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -730,8 +730,7 @@ bar.  In the mean time, it should process other messages.
 *** Magit
 This needs work on getting the relevant copyright assignments.  This
 task should be highly doable for anyone, but will likely require some
-patience.  For inspiration, see how this was done for 'use-package':
-https://github.com/jwiegley/use-package/issues/282
+patience.  See <https://debbugs.gnu.org/72127>.
 
 *** PSGML, _possibly_ ECB
 https://lists.gnu.org/r/emacs-devel/2007-05/msg01493.html Check the

From a7b68c25640de8214bc759d20180373c2dbcfa16 Mon Sep 17 00:00:00 2001
From: Peter Oliver <git@mavit.org.uk>
Date: Mon, 15 Jul 2024 12:03:47 +0100
Subject: [PATCH 3/3] Fix intermittent failure of dired-test-bug27243-02

* test/lisp/dired-tests.el (dired-test-bug27243-02): Exclude free disk
space from dired listing in this test, in case it changes while it's
running and confuses the result.  (Bug#72120)
---
 test/lisp/dired-tests.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el
index 651b77500a1..3b1f80d3d3d 100644
--- a/test/lisp/dired-tests.el
+++ b/test/lisp/dired-tests.el
@@ -189,7 +189,9 @@
 (ert-deftest dired-test-bug27243-02 ()
   "Test for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27243#28 ."
   (ert-with-temp-directory test-dir
-    (let ((dired-auto-revert-buffer t) buffers)
+    (let ((dired-auto-revert-buffer t)
+          (dired-free-space nil)
+          buffers)
       ;; On MS-Windows, get rid of 8+3 short names in test-dir, if the
       ;; corresponding long file names exist, otherwise such names trip
       ;; string comparisons below.