summaryrefslogtreecommitdiff
path: root/lisp/progmodes/cc-bytecomp.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-08-23 11:31:31 +0200
committerAndrea Corallo <akrl@sdf.org>2020-08-23 12:08:26 +0200
commit6088d199595d102ad6701512560322e74e181d27 (patch)
tree2f789102908a157f24dc84dc623187b2ca1e1992 /lisp/progmodes/cc-bytecomp.el
parent5f5d664c734414597c1c7d9981b1ceb9ff69c5b1 (diff)
downloademacs-6088d199595d102ad6701512560322e74e181d27.tar.gz
* 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.
Diffstat (limited to 'lisp/progmodes/cc-bytecomp.el')
-rw-r--r--lisp/progmodes/cc-bytecomp.el4
1 files changed, 3 insertions, 1 deletions
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)