(cl-cannot-unload): Remove function.

(cl-unload-hook): Remove variable.
(cl-unload-function): New-style unload function,
adapted from `cl-cannot-unload'.

diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 6174e06edb6444bf11a9a41548f9bcd66476c5c6..c8a029a453aaad431dbf30ba096f150dcb925204 100644 (file)
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -109,9 +109,11 @@ 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.")
 
-(add-hook 'cl-unload-hook 'cl-cannot-unload)
-(defun cl-cannot-unload ()
-  (error "Cannot unload the feature `cl'"))
+(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