(toplevel): Remove definition of `cl-assertion-failed' condition --

it's defined in subr.el instead.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 542c951ad015fb98e5753a31c338ba883ea70e54..ca86a0a27b6d3dd80b4552d5f46b4b7f4254447a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-30  John Paul Wallington  <jpw@pobox.com>
+
+       * subr.el (toplevel): Define `cl-assertion-failed' condition here
+       because the `assert' macro signals it at runtime.
+
+       * emacs-lisp/cl.el (toplevel): Remove definition of
+       `cl-assertion-failed' condition.
+
 2006-01-30  Nick Roberts  <nickrob@snap.net.nz>
 
        * thumbs.el (thumbs-marked-list): Make buffer-local and

diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 8875366cc9c8710e1cc83b3e82264978d645b150..b7cf3ad8bcc898cd53419acb027b3d331ab72d3e 100644 (file)
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -580,9 +580,6 @@ If ALIST is non-nil, the new pairs are prepended to it."
 
 ;;; Miscellaneous.
 
-(put 'cl-assertion-failed 'error-conditions '(error))
-(put 'cl-assertion-failed 'error-message "Assertion failed")
-
 (defvar cl-fake-autoloads nil
   "Non-nil means don't make CL functions autoload.")