Commit e5b19827 authored by Andreas Schwab's avatar Andreas Schwab

Fixes: debbugs:12197

* emacs-lisp/bytecomp.el (byte-recompile-file): When LOAD is
non-nil always load the compiled file if it exists.
parent 56120d6f
2012-08-14 Andreas Schwab <schwab@linux-m68k.org>
* emacs-lisp/bytecomp.el (byte-recompile-file): When LOAD is
non-nil always load the compiled file if it exists. (Bug#12197)
2012-08-14 Chong Yidong <cyd@gnu.org>
* hi-lock.el (hi-lock-mode): Do not unilaterally enable font lock.
......
......@@ -1632,7 +1632,7 @@ not* compile FILENAME. If ARG is 0, that means
compile the file even if it has never been compiled before.
A nonzero ARG means ask the user.
If LOAD is set, `load' the file after compiling.
If LOAD is non-nil, `load' the file after compiling.
The value returned is the value returned by `byte-compile-file',
or 'no-byte-compile if the file did not need recompilation."
......@@ -1665,7 +1665,8 @@ or 'no-byte-compile if the file did not need recompilation."
(if (and noninteractive (not byte-compile-verbose))
(message "Compiling %s..." filename))
(byte-compile-file filename load))
(when load (load filename))
(when load
(load (if (file-exists-p dest) dest filename)))
'no-byte-compile)))
;;;###autoload
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment