master 1af0c21eb0c: Merge from origin/emacs-29

[Stefan Kangas]

branch: master
commit 1af0c21eb0cc787e202703cb83e43b0b09058625
Merge: 66fdd45bdd8 80122cde3db
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Merge from origin/emacs-29
    
    80122cde3db ; Unbreak bootstrap
    
    # Conflicts:
    #       lisp/ldefs-boot.el
---
 lisp/progmodes/dockerfile-ts-mode.el | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lisp/progmodes/dockerfile-ts-mode.el 
b/lisp/progmodes/dockerfile-ts-mode.el
index e08387ad969..1ece3dd59bf 100644
--- a/lisp/progmodes/dockerfile-ts-mode.el
+++ b/lisp/progmodes/dockerfile-ts-mode.el
@@ -131,10 +131,8 @@ the subtrees."
 
 ;;;###autoload
 (add-to-list 'auto-mode-alist
-             `(,(rx (|
-                     (: "Dockerfile" (? "." (* nonl)))
-                     (: "." (any "dD") "ockerfile"))
-                    eol)
+             ;; NOTE: We can't use `rx' here, as it breaks bootstrap.
+             '("\\(?:Dockerfile\\(?:\\..*\\)?\\|\\.[Dd]ockerfile\\)$"
                . dockerfile-ts-mode))
 
 ;;;###autoload