summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/subr.el6
1 files changed, 6 insertions, 0 deletions
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.