diff options
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index dbc3ab79def..c6bd930cdf7 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") @@ -346,6 +345,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") @@ -353,6 +359,10 @@ (load "vc/ediff-hook") (load "uniquify") (load "electric") +(load "paren") + +(load "emacs-lisp/shorthands") + (load "emacs-lisp/eldoc") (load "cus-start") ;Late to reduce customize-rogue (needs loaddefs.el anyway) (if (not (eq system-type 'ms-dos)) @@ -527,7 +537,7 @@ lost after dumping"))) ((equal dump-mode "dump") "emacs") ((equal dump-mode "bootstrap") "emacs") ((equal dump-mode "pbootstrap") "bootstrap-emacs.pdmp") - (t (error "unrecognized dump mode %s" dump-mode))))) + (t (error "Unrecognized dump mode %s" dump-mode))))) (when (and (featurep 'native-compile) (equal dump-mode "pdump")) ;; Don't enable this before bootstrap is completed, as the @@ -542,7 +552,8 @@ lost after dumping"))) (let (success) (unwind-protect (let ((tmp-dump-mode dump-mode) - (dump-mode nil)) + (dump-mode nil) + (lexical-binding nil)) (if (member tmp-dump-mode '("pdump" "pbootstrap")) (dump-emacs-portable (expand-file-name output invocation-directory)) (dump-emacs output "temacs") |