[PATCH 2/4] Use byte-recompile-file in emacs-lisp-byte-compile-and-load

[Julien Danjou <julien@danjou.info>]

Signed-off-by: Julien Danjou <julien@danjou.info>
---
 lisp/ChangeLog               |    3 +++
 lisp/emacs-lisp/lisp-mode.el |    5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34a1dfd..175286b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-21  Julien Danjou  <julien@danjou.info>
 
+	* emacs-lisp/lisp-mode.el (emacs-lisp-byte-compile-and-load): Use
+	`byte-recompile-file'.
+
 	* emacs-lisp/bytecomp.el (byte-recompile-file): Add this function.
 	(byte-recompile-directory): Use `byte-recompile-file'.
 
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index e4330e4..ef639d6 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -407,10 +407,7 @@ All commands in `lisp-mode-shared-map' are inherited by this map.")
   (if (and (buffer-modified-p)
 	   (y-or-n-p (format "Save buffer %s first? " (buffer-name))))
       (save-buffer))
-  (let ((compiled-file-name (byte-compile-dest-file buffer-file-name)))
-    (if (file-newer-than-file-p compiled-file-name buffer-file-name)
-	(load-file compiled-file-name)
-      (byte-compile-file buffer-file-name t))))
+  (byte-recompile-file buffer-file-name nil 0 t))
 
 (defcustom emacs-lisp-mode-hook nil
   "Hook run when entering Emacs Lisp mode."
-- 
1.7.1