procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; Fix bootstrap (Bug#74490)

Browse source 
* lisp/progmodes/python.el (python--auto-mode-alist-regexp): Don't use
rx in autoloaded variable, since it breaks bootstrap when copied to
ldefs-boot.el.
* lisp/ldefs-boot.el: Update.
This commit is contained in:
Stefan Kangas 2024-11-23 16:42:46 +01:00
parent 30bcba27c8
commit d4cb3b30f1
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ldefs-boot.el
View file

@ -26407,7 +26407,7 @@ Optional argument FACE specifies the face to do the highlighting.
;;; Generated autoloads from progmodes/python.el
(push (purecopy '(python 0 28)) package--builtin-versions)
(defconst python--auto-mode-alist-regexp (rx (or (seq "." (or "py" "pth" "pyi" "pyw")) (seq "/" (or "SConstruct" "SConscript"))) eos))
(defconst python--auto-mode-alist-regexp "\\(?:\\.\\(?:p\\(?:th\\|y[iw]?\\)\\)\\|/\\(?:SCons\\(?:\\(?:crip\\|truc\\)t\\)\\)\\)\\'")
(add-to-list 'auto-mode-alist (cons python--auto-mode-alist-regexp 'python-mode))
(add-to-list 'interpreter-mode-alist (cons (purecopy "python[0-9.]*") 'python-mode))
(autoload 'run-python "python" "\

16
lisp/progmodes/python.el
View file

@ -278,13 +278,15 @@
;;;###autoload
(defconst python--auto-mode-alist-regexp
(rx (or
(seq "." (or "py"
"pth" ; Python Path Configuration File
"pyi" ; Python Stub File (PEP 484)
"pyw")) ; MS-Windows specific extension
(seq "/" (or "SConstruct" "SConscript"))) ; SCons Build Files
eos))
;; (rx (or
;; (seq "." (or "py"
;; "pth" ; Python Path Configuration File
;; "pyi" ; Python Stub File (PEP 484)
;; "pyw")) ; MS-Windows specific extension
;; (seq "/" (or "SConstruct" "SConscript"))) ; SCons Build Files
;; eos)
"\\(?:\\.\\(?:p\\(?:th\\|y[iw]?\\)\\)\\|/\\(?:SCons\\(?:\\(?:crip\\|truc\\)t\\)\\)\\)\\'"
)
;;;###autoload
(add-to-list 'auto-mode-alist (cons python--auto-mode-alist-regexp 'python-mode))