[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111001: * lisp/emacs-lisp/cl.el, lisp/emacs-lisp/cl-lib.el: Move cl-unload-function and

[Stefan Monnier]

------------------------------------------------------------
revno: 111001
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-12-06 16:08:50 -0500
message:
  * lisp/emacs-lisp/cl.el, lisp/emacs-lisp/cl-lib.el: Move cl-unload-function 
and
  cl-load-hook where they belong.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/cl-lib.el
  lisp/emacs-lisp/cl.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-06 03:04:21 +0000
+++ b/lisp/ChangeLog    2012-12-06 21:08:50 +0000
@@ -1,3 +1,8 @@
+2012-12-06  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * ffap.el (ffap-replace-file-component): Fix typo.

=== modified file 'lisp/emacs-lisp/cl-lib.el'
--- a/lisp/emacs-lisp/cl-lib.el 2012-11-17 01:29:24 +0000
+++ b/lisp/emacs-lisp/cl-lib.el 2012-12-06 21:08:50 +0000
@@ -113,12 +113,6 @@
 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 @@
 
 (provide 'cl-lib)
 
-(run-hooks 'cl-load-hook)
-
 ;; Local variables:
 ;; byte-compile-dynamic: t
 ;; End:

=== modified file 'lisp/emacs-lisp/cl.el'
--- a/lisp/emacs-lisp/cl.el     2012-11-07 08:56:16 +0000
+++ b/lisp/emacs-lisp/cl.el     2012-12-06 21:08:50 +0000
@@ -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 @@
          (list accessor temp))))
 
 (provide 'cl)
+
+(run-hooks 'cl-load-hook)
+
 ;;; cl.el ends here