From 6088d199595d102ad6701512560322e74e181d27 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Sun, 23 Aug 2020 11:31:31 +0200 Subject: [PATCH] * A cc-mode fix to be compiled correctly once installed * lisp/progmodes/cc-bytecomp.el (cc-bytecomp-load): If cc-mode is not compiled during the initial build (read NATIVE_FAST_BOOT) it will be when already in el.gz form. --- lisp/progmodes/cc-bytecomp.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el index 5eb8af25343..ad884288a6d 100644 --- a/lisp/progmodes/cc-bytecomp.el +++ b/lisp/progmodes/cc-bytecomp.el @@ -286,7 +286,9 @@ perhaps a `cc-bytecomp-restore-environment' is forgotten somewhere")) (cons cc-file cc-bytecomp-loaded-files)) (cc-bytecomp-debug-msg "cc-bytecomp-load: Loading %S" cc-file) - (load cc-file nil t t) + ;; native-comp may async compile also intalled el.gz + ;; files therefore we may have to load here other el.gz. + (load cc-part nil t) (cc-bytecomp-debug-msg "cc-bytecomp-load: Loaded %S" cc-file))) (cc-bytecomp-setup-environment) -- 2.39.5