From: Eli Zaretskii Date: Sat, 18 Sep 2021 07:56:05 +0000 (+0300) Subject: ; * lisp/loadup.el: Fix "Eager macro-expansion error" on w32. X-Git-Tag: emacs-28.0.90~873 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0788ab9e5c5c780f050f73c10ad3c71e9defd6dc;p=emacs.git ; * lisp/loadup.el: Fix "Eager macro-expansion error" on w32. --- diff --git a/lisp/loadup.el b/lisp/loadup.el index 0ea441de012..1889ff562c6 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -275,7 +275,6 @@ (load "textmodes/paragraphs") (load "progmodes/prog-mode") (load "emacs-lisp/lisp-mode") -(load "progmodes/elisp-mode") (load "textmodes/text-mode") (load "textmodes/fill") (load "newcomment") @@ -339,6 +338,13 @@ ;; Do it after loading term/foo-win.el since the value of the ;; mouse-wheel-*-event vars depends on those files being loaded or not. (load "mwheel")) + +;; progmodes/elisp-mode.el must be after w32-fns.el, to avoid this: +;;"Eager macro-expansion failure: (void-function w32-convert-standard-filename)" +;; which happens while processing 'elisp-flymake-byte-compile', when +;; elisp-mode.elc is outdated. +(load "progmodes/elisp-mode") + ;; Preload some constants and floating point functions. (load "emacs-lisp/float-sup")