diff options
| author | John Paul Wallington <jpw@pobox.com> | 2006-01-30 19:58:41 +0000 |
|---|---|---|
| committer | John Paul Wallington <jpw@pobox.com> | 2006-01-30 19:58:41 +0000 |
| commit | c45c309fe28b83f7ab0c59ea225084374c783931 (patch) | |
| tree | 602ed27b0f8e63a727ed9fb81e8153ae5db66e67 | |
| parent | 28ac46f87d7254fa03072625609b65cadd9e09b5 (diff) | |
| download | emacs-c45c309fe28b83f7ab0c59ea225084374c783931.tar.gz | |
(toplevel): Remove definition of `cl-assertion-failed' condition --
it's defined in subr.el instead.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl.el | 3 |
2 files changed, 8 insertions, 3 deletions
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.") |