Use bytecomp-load-hook, not emacs-lisp-mode-hook.

Don't check for defalias being defined.

diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 49a07a2f6d136a75a8ab1768d835291f6b84a663..830a3e8d1ffc2eaa11dcd3a6c974a2d88e17f941 100644 (file)
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -93,8 +93,6 @@
 
 ;;; Code:
 
-(or (fboundp 'defalias) (fset 'defalias 'fset))
-
 (defvar cl-optimize-speed 1)
 (defvar cl-optimize-safety 1)
 
@@ -670,12 +668,7 @@ Keywords supported:  :test :test-not :key"
 (cl-hack-byte-compiler)
 
 ;;; Also make a hook in case compiler is loaded after this file.
-;;; The compiler doesn't call any hooks when it loads or runs, but
-;;; we can take advantage of the fact that emacs-lisp-mode will be
-;;; called when the compiler reads in the file to be compiled.
-;;; BUG: If the first compilation is `byte-compile' rather than
-;;; `byte-compile-file', we lose.  Oh, well.
-(add-hook 'emacs-lisp-mode-hook 'cl-hack-byte-compiler)
+(add-hook 'bytecomp-load-hook 'cl-hack-byte-compiler)
 
 
 ;;; The following ensures that packages which expect the old-style cl.el