diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-11-19 12:02:20 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-11-19 12:02:20 -0500 |
| commit | bc715d67b3997988e2a48286410d45404e49342c (patch) | |
| tree | caebf53761b7610f0d8c9da489b10a2c273eaebb /lisp/emacs-lisp/ert.el | |
| parent | d7f2a65cc22f1383b7d9a0e78e7bb90c19f56a39 (diff) | |
| download | emacs-bc715d67b3997988e2a48286410d45404e49342c.tar.gz emacs-bc715d67b3997988e2a48286410d45404e49342c.tar.bz2 emacs-bc715d67b3997988e2a48286410d45404e49342c.zip | |
* lisp/emacs-lisp/ert.el (ert--expand-should-1): Adapt to cl-lib.
Diffstat (limited to 'lisp/emacs-lisp/ert.el')
| -rw-r--r-- | lisp/emacs-lisp/ert.el | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index ff00be7a237..9cbf417d876 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -388,16 +388,11 @@ DATA is displayed to the user and should state the reason of the failure." (defun ert--expand-should-1 (whole form inner-expander) "Helper function for the `should' macro and its variants." (let ((form - ;; If `cl-macroexpand' isn't bound, the code that we're - ;; compiling doesn't depend on cl and thus doesn't need an - ;; environment arg for `macroexpand'. - (if (fboundp 'cl-macroexpand) - ;; Suppress warning about run-time call to cl function: we - ;; only call it if it's fboundp. - (with-no-warnings - (cl-macroexpand form (and (boundp 'cl-macro-environment) - cl-macro-environment))) - (macroexpand form)))) + (macroexpand form (cond + ((boundp 'macroexpand-all-environment) + macroexpand-all-environment) + ((boundp 'cl-macro-environment) + cl-macro-environment))))) (cond ((or (atom form) (ert--special-operator-p (car form))) (let ((value (ert--gensym "value-"))) |