From: John Paul Wallington <jpw@pobox.com>
Date: Mon, 30 Jan 2006 19:55:29 +0000 (+0000)
Subject: (toplevel): Define `cl-assertion-failed' condition here because the
X-Git-Tag: emacs-pretest-22.0.90~4484
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=28ac46f87d7254fa03072625609b65cadd9e09b5;p=emacs.git

(toplevel): Define `cl-assertion-failed' condition here because the
`assert' macro from the cl package signals it at runtime.
---

diff --git a/lisp/subr.el b/lisp/subr.el
index d335a1d4e0f..94d667bb5f2 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1831,6 +1831,12 @@ mode.")
 This variable is meaningful on MS-DOG and Windows NT.
 On those systems, it is automatically local in every buffer.
 On other systems, this variable is normally always nil.")
+
+;; The `assert' macro from the cl package signals
+;; `cl-assertion-failed' at runtime so always define it.
+(put 'cl-assertion-failed 'error-conditions '(error))
+(put 'cl-assertion-failed 'error-message "Assertion failed")
+
 
 ;;;; Misc. useful functions.