[Emacs-diffs] /srv/bzr/emacs/trunk r109600: Fixes: debbugs:12197

[Andreas Schwab]

------------------------------------------------------------
revno: 109600
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Tue 2012-08-14 10:37:41 +0200
message:
  Fixes: debbugs:12197
  
  * emacs-lisp/bytecomp.el (byte-recompile-file): When LOAD is
  non-nil always load the compiled file if it exists.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/bytecomp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-14 06:52:59 +0000
+++ b/lisp/ChangeLog    2012-08-14 08:37:41 +0000
@@ -1,3 +1,8 @@
+2012-08-14  Andreas Schwab  <address@hidden>
+
+       * 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  <address@hidden>
 
        * hi-lock.el (hi-lock-mode): Do not unilaterally enable font lock.

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el       2012-07-26 01:27:33 +0000
+++ b/lisp/emacs-lisp/bytecomp.el       2012-08-14 08:37:41 +0000
@@ -1632,7 +1632,7 @@
 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 @@
           (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