From f48c2a446e5343f8ad104eb5523e834bb127825d Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sat, 5 Sep 2020 02:14:54 +0200 Subject: [PATCH] Ensure byte-compile-file loads file with non-nil load arg * lisp/emacs-lisp/bytecomp.el (byte-compile-file): Load file when argument 'load' is non-nil, even if 'no-byte-compile' is also non-nil. (Bug#38072) --- lisp/emacs-lisp/bytecomp.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 966990bac9..d6db318e65 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1970,6 +1970,9 @@ byte-compile-file (byte-compile-abbreviate-file target-file) (buffer-local-value 'no-byte-compile input-buffer)) (condition-case nil (delete-file target-file) (error nil))) + ;; Load the file even when not byte-compiling. (Bug#38072) + (when load + (load target-file)) ;; We successfully didn't compile this file. 'no-byte-compile) (when byte-compile-verbose -- 2.28.0