* lisp/emacs-lisp/cl.el, lisp/emacs-lisp/cl-lib.el: Move cl-unload-function and

cl-load-hook where they belong.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a4f40e6a80d18f1dcb7aab7a7278c2f8c0bcc45b..7e63136bac8d4a38aacea16e04f5104d926d431a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/cl.el, emacs-lisp/cl-lib.el: Move cl-unload-function and
+       cl-load-hook where they belong.
+
 2012-12-06  Chong Yidong  <cyd@gnu.org>
 
        * ffap.el (ffap-replace-file-component): Fix typo.

diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 7b22c7aac419af3c4c0325973b58630fd0b928ef..c748b6b583ba548230756c5bef6a6161679cf458 100644 (file)
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -113,12 +113,6 @@ printer proceeds to the next function on the list.
 This variable is not used at present, but it is defined in hopes that
 a future Emacs interpreter will be able to use it.")
 
-(defun cl-unload-function ()
-  "Stop unloading of the Common Lisp extensions."
-  (message "Cannot unload the feature `cl'")
-  ;; Stop standard unloading!
-  t)
-
 ;;; Generalized variables.
 ;; These macros are defined here so that they
 ;; can safely be used in init files.
@@ -747,8 +741,6 @@ If ALIST is non-nil, the new pairs are prepended to it."
 
 (provide 'cl-lib)
 
-(run-hooks 'cl-load-hook)
-
 ;; Local variables:
 ;; byte-compile-dynamic: t
 ;; End:

diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 016967bc71379f845335b6e8ba81f301534f0da1..3d0ca476800e9a35ddcd54f23f4ae69d5a8ec8a0 100644 (file)
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -83,6 +83,12 @@
 ;;           (delete-region (1- (point)) (point)))
 ;;         (save-buffer)))))
 
+(defun cl-unload-function ()
+  "Stop unloading of the Common Lisp extensions."
+  (message "Cannot unload the feature `cl'")
+  ;; Stop standard unloading!
+  t)
+
 ;;; Aliases to cl-lib's features.
 
 (dolist (var '(
@@ -737,4 +743,7 @@ You can replace this macro with `gv-letplace'."
          (list accessor temp))))
 
 (provide 'cl)
+
+(run-hooks 'cl-load-hook)
+
 ;;; cl.el ends here