1 files changed, 2 insertions, 3 deletions

diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el
index a76bcf604f7..ecc5f7e47bd 100644
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -738,13 +738,12 @@ rules for built-in packages and excluded files."
       (expand-file-name "emacs-lisp/loaddefs-gen.el" lisp-directory)
       output-file)))
   (let ((lisp-mode-autoload-regexp
-         ;; Avoid autoloads detection from loaddefs-gen.
-         (concat "^;;;###\\(\\(noexist\\)-\\)?\\(theme" "-autoload\\)")))
+         "^;;;###\\(\\(noexist\\)-\\)?\\(theme-autoload\\)"))
       (loaddefs-generate
        (expand-file-name "../etc/themes/" lisp-directory)
        (expand-file-name "theme-loaddefs.el" lisp-directory))))
 
-;;;###autoload (load "theme-loaddefs.el")
+;;;###autoload (load "theme-loaddefs.el" t)
 
 (provide 'loaddefs-gen)