2 files changed, 5 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd57969f73f..dae3e640cc2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-22  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs-lisp/edebug.el (top): Do not load or setup up loading of
+        cl-specs.el, which no longer exists.
+
 2012-05-22  Glenn Morris  <rgm@gnu.org>
 
         * info.el (info-emacs-bug): New command.
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index f47feebe5d2..2c7e7cf6362 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1938,7 +1938,6 @@ expressions; a `progn' form will be returned enclosing these forms."
 
 ;;;; Edebug Form Specs
 ;;; ==========================================================
-;;; See cl-specs.el for common lisp specs.
 
 ;;;;* Spec for def-edebug-spec
 ;;; Out of date.
@@ -4437,13 +4436,6 @@ With prefix argument, make it a temporary breakpoint."
 
 ;;; Autoloading of Edebug accessories
 
-(if (featurep 'cl)
-    (add-hook 'edebug-setup-hook
-              (function (lambda () (require 'cl-specs))))
-  ;; The following causes cl-specs to be loaded if you load cl.el.
-  (add-hook 'cl-load-hook
-            (function (lambda () (require 'cl-specs)))))
-
 ;; edebug-cl-read and cl-read are available from liberte@cs.uiuc.edu
 (if (featurep 'cl-read)
     (add-hook 'edebug-setup-hook