diff options
| author | Juanma Barranquero | 2012-05-22 18:45:44 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2012-05-22 18:45:44 +0200 |
| commit | 5dadff364eeed09fbe1eda38e19d17eff729c245 (patch) | |
| tree | 2918f5c32c7bda069fbb7d4b8ad6a428ad5fad59 | |
| parent | 584461b299fdbf77138a7b25a070b767474e5b70 (diff) | |
| download | emacs-5dadff364eeed09fbe1eda38e19d17eff729c245.tar.gz emacs-5dadff364eeed09fbe1eda38e19d17eff729c245.zip | |
lisp/emacs-lisp/edebug.el: Do not load cl-specs.el.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 8 |
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 @@ | |||
| 1 | 2012-05-22 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * emacs-lisp/edebug.el (top): Do not load or setup up loading of | ||
| 4 | cl-specs.el, which no longer exists. | ||
| 5 | |||
| 1 | 2012-05-22 Glenn Morris <rgm@gnu.org> | 6 | 2012-05-22 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * info.el (info-emacs-bug): New command. | 8 | * 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." | |||
| 1938 | 1938 | ||
| 1939 | ;;;; Edebug Form Specs | 1939 | ;;;; Edebug Form Specs |
| 1940 | ;;; ========================================================== | 1940 | ;;; ========================================================== |
| 1941 | ;;; See cl-specs.el for common lisp specs. | ||
| 1942 | 1941 | ||
| 1943 | ;;;;* Spec for def-edebug-spec | 1942 | ;;;;* Spec for def-edebug-spec |
| 1944 | ;;; Out of date. | 1943 | ;;; Out of date. |
| @@ -4437,13 +4436,6 @@ With prefix argument, make it a temporary breakpoint." | |||
| 4437 | 4436 | ||
| 4438 | ;;; Autoloading of Edebug accessories | 4437 | ;;; Autoloading of Edebug accessories |
| 4439 | 4438 | ||
| 4440 | (if (featurep 'cl) | ||
| 4441 | (add-hook 'edebug-setup-hook | ||
| 4442 | (function (lambda () (require 'cl-specs)))) | ||
| 4443 | ;; The following causes cl-specs to be loaded if you load cl.el. | ||
| 4444 | (add-hook 'cl-load-hook | ||
| 4445 | (function (lambda () (require 'cl-specs))))) | ||
| 4446 | |||
| 4447 | ;; edebug-cl-read and cl-read are available from liberte@cs.uiuc.edu | 4439 | ;; edebug-cl-read and cl-read are available from liberte@cs.uiuc.edu |
| 4448 | (if (featurep 'cl-read) | 4440 | (if (featurep 'cl-read) |
| 4449 | (add-hook 'edebug-setup-hook | 4441 | (add-hook 'edebug-setup-hook |