From: Andreas Schwab <schwab@linux-m68k.org>
Date: Tue, 14 Aug 2012 08:37:41 +0000 (+0200)
Subject: Fixes: debbugs:12197
X-Git-Tag: emacs-24.2.90~689
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e5b19827faaff8168889c9cf3c8f746fd67e6991;p=emacs.git

Fixes: debbugs:12197

* emacs-lisp/bytecomp.el (byte-recompile-file): When LOAD is
non-nil always load the compiled file if it exists.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 285e69d9db1..7232fa9f62b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index e5df8dd112c..1e0ab336f41 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -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