diff options
| -rw-r--r-- | lisp/emacs-lisp/cl-preloaded.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el index cd1d700f1b0..639ffa64b8c 100644 --- a/lisp/emacs-lisp/cl-preloaded.el +++ b/lisp/emacs-lisp/cl-preloaded.el | |||
| @@ -44,11 +44,9 @@ | |||
| 44 | (define-error 'cl-assertion-failed (purecopy "Assertion failed")) | 44 | (define-error 'cl-assertion-failed (purecopy "Assertion failed")) |
| 45 | 45 | ||
| 46 | (defun cl--assertion-failed (form &optional string sargs args) | 46 | (defun cl--assertion-failed (form &optional string sargs args) |
| 47 | (if debug-on-error | 47 | (if string |
| 48 | (debug `(cl-assertion-failed ,form ,string ,@sargs)) | 48 | (apply #'error string (append sargs args)) |
| 49 | (if string | 49 | (signal 'cl-assertion-failed `(,form ,@sargs)))) |
| 50 | (apply #'error string (append sargs args)) | ||
| 51 | (signal 'cl-assertion-failed `(,form ,@sargs))))) | ||
| 52 | 50 | ||
| 53 | ;; When we load this (compiled) file during pre-loading, the cl--struct-class | 51 | ;; When we load this (compiled) file during pre-loading, the cl--struct-class |
| 54 | ;; code below will need to access the `cl-struct' info, since it's considered | 52 | ;; code below will need to access the `cl-struct' info, since it's considered |