[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 0788ab9: ; * lisp/loadup.el: Fix "Eager macro-expansion error" on
From: |
Eli Zaretskii |
Subject: |
master 0788ab9: ; * lisp/loadup.el: Fix "Eager macro-expansion error" on w32. |
Date: |
Sat, 18 Sep 2021 03:56:49 -0400 (EDT) |
branch: master
commit 0788ab9e5c5c780f050f73c10ad3c71e9defd6dc
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
; * lisp/loadup.el: Fix "Eager macro-expansion error" on w32.
---
lisp/loadup.el | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 0ea441d..1889ff5 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")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 0788ab9: ; * lisp/loadup.el: Fix "Eager macro-expansion error" on w32.,
Eli Zaretskii <=