diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-02-01 02:04:15 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-02-01 02:04:15 +0000 |
| commit | eb2bfdae0a1b6579908f072ab57aec0d80d6c6ec (patch) | |
| tree | 2abdd13c797be8b59fa9cbd25de93db07ead9ca9 /lisp/subr.el | |
| parent | 55187be10d911cb5c0b41b6a64b5e9edb28ae60a (diff) | |
| parent | 4cdcdcc9ce7ba9f8644432e755a450b1b62b522a (diff) | |
| download | emacs-eb2bfdae0a1b6579908f072ab57aec0d80d6c6ec.tar.gz | |
Merged from
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-31
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-503
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index 1433b4c0dfd..b97ed1ba566 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. |