From: John Paul Wallington <jpw@pobox.com>
Date: Mon, 30 Jan 2006 19:58:41 +0000 (+0000)
Subject: (toplevel): Remove definition of `cl-assertion-failed' condition --
X-Git-Tag: emacs-pretest-22.0.90~4483
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c45c309fe28b83f7ab0c59ea225084374c783931;p=emacs.git

(toplevel): Remove definition of `cl-assertion-failed' condition --
it's defined in subr.el instead.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 542c951ad01..ca86a0a27b6 100644
--- 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 8875366cc9c..b7cf3ad8bcc 100644
--- 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.")