summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorKaroly Lorentey <lorentey@elte.hu>2006-02-01 02:04:15 +0000
committerKaroly Lorentey <lorentey@elte.hu>2006-02-01 02:04:15 +0000
commiteb2bfdae0a1b6579908f072ab57aec0d80d6c6ec (patch)
tree2abdd13c797be8b59fa9cbd25de93db07ead9ca9 /lisp/emacs-lisp
parent55187be10d911cb5c0b41b6a64b5e9edb28ae60a (diff)
parent4cdcdcc9ce7ba9f8644432e755a450b1b62b522a (diff)
downloademacs-eb2bfdae0a1b6579908f072ab57aec0d80d6c6ec.tar.gz
emacs-eb2bfdae0a1b6579908f072ab57aec0d80d6c6ec.tar.bz2
emacs-eb2bfdae0a1b6579908f072ab57aec0d80d6c6ec.zip
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/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/cl.el3
1 files changed, 0 insertions, 3 deletions
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.")