Fix bootstrap

diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index ffc8e2e58daa73bf78de3fa0925521e528ad50e2..c78d8f557668a3e0c5e785ab2ffd87d879464c67 100644 (file)
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -25347,8 +25347,6 @@ 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))
-(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" "\
 Run an inferior Python process.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 18baf136f576ca19e2cec65f640bb92f1c04e76e..5025455f0de9141fd2dc44f75fd10a80d84f4af4 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -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))
+  "\\(?:\\.\\(?:p\\(?:th\\|y[iw]?\\)\\)\\|/\\(?:SCons\\(?:\\(?:crip\\|truc\\)t\\)\\)\\)\\'"
+  ;; (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)
+  )
 
 ;;;###autoload
 (add-to-list 'auto-mode-alist (cons python--auto-mode-alist-regexp 'python-mode))