Don't call debug on failed cl-assert

Doing this causes problems when running ert tests, for
instance (Bug#24778).  The call to `debug` when `debug-on-error' is
non-nil was introduced in 2015-02-14 "* lisp/emacs-lisp/cl*.el: Use
define-inline and move some code...".

* lisp/emacs-lisp/cl-preloaded.el (cl--assertion-failed): Don't call
`debug' directly.

diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
index cd1d700f1b0c0b2d0e446a75f5edc2d401a1127b..639ffa64b8cbdae6d99cebde12e1460d0db1c466 100644 (file)
--- a/lisp/emacs-lisp/cl-preloaded.el
+++ b/lisp/emacs-lisp/cl-preloaded.el
@@ -44,11 +44,9 @@
 (define-error 'cl-assertion-failed (purecopy "Assertion failed"))
 
 (defun cl--assertion-failed (form &optional string sargs args)
-  (if debug-on-error
-      (debug `(cl-assertion-failed ,form ,string ,@sargs))
-    (if string
-        (apply #'error string (append sargs args))
-      (signal 'cl-assertion-failed `(,form ,@sargs)))))
+  (if string
+      (apply #'error string (append sargs args))
+    (signal 'cl-assertion-failed `(,form ,@sargs))))
 
 ;; When we load this (compiled) file during pre-loading, the cl--struct-class
 ;; code below will need to access the `cl-struct' info, since it's considered