[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 db436e9: Don't call debug on failed cl-assert
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] emacs-25 db436e9: Don't call debug on failed cl-assert |
Date: |
Sat, 5 Nov 2016 01:57:20 +0000 (UTC) |
branch: emacs-25
commit db436e93cae16b34b951c2f210705fbd30ad2922
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
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.
---
lisp/emacs-lisp/cl-preloaded.el | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
index cd1d700..639ffa6 100644
--- 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 db436e9: Don't call debug on failed cl-assert,
Noam Postavsky <=