Commit bc715d67 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/emacs-lisp/ert.el (ert--expand-should-1): Adapt to cl-lib.

parent d7f2a65c
2012-11-19 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/ert.el (ert--expand-should-1): Adapt to cl-lib.
2012-11-19 Michael Albinus <michael.albinus@gmx.de>
 
* net/tramp-sh.el (tramp-do-copy-or-rename-file): If both files
......
......@@ -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-")))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment