From 80122cde3dbcd191b4b82e463fb26777b355a4b3 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 11 Dec 2022 02:32:21 +0100 Subject: [PATCH] ; 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 -- 2.39.2