emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-29 80122cde3db: ; Unbreak bootstrap


From: Stefan Kangas
Subject: emacs-29 80122cde3db: ; Unbreak bootstrap
Date: Sat, 10 Dec 2022 20:57:17 -0500 (EST)

branch: emacs-29
commit 80122cde3dbcd191b4b82e463fb26777b355a4b3
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    ; Unbreak bootstrap
    
    * lisp/progmodes/dockerfile-ts-mode.el (auto-mode-alist): Wrap
    autoloaded definition using the rx macro in eval-and-compile.
---
 lisp/ldefs-boot.el                   | 2 +-
 lisp/progmodes/dockerfile-ts-mode.el | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 5765d2d4feb..fb89baf0949 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -7980,7 +7980,7 @@ it is disabled.
 
 ;;; Generated autoloads from progmodes/dockerfile-ts-mode.el
 
-(add-to-list 'auto-mode-alist `(,(rx (| (: "Dockerfile" (32 "." (* nonl))) (: 
"." (any "dD") "ockerfile")) eol) . dockerfile-ts-mode))
+(add-to-list 'auto-mode-alist 
'("\\(?:Dockerfile\\(?:\\..*\\)?\\|\\.[Dd]ockerfile\\)$" . dockerfile-ts-mode))
 (autoload 'dockerfile-ts-mode "dockerfile-ts-mode" "\
 Major mode for editing Dockerfiles, powered by tree-sitter.
 
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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]