[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110916: * lisp/emacs-lisp/ert.el (ert--expand-should-1): Adapt to cl-lib.

[Stefan Monnier]

------------------------------------------------------------
revno: 110916
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-11-19 12:02:20 -0500
message:
  * lisp/emacs-lisp/ert.el (ert--expand-should-1): Adapt to cl-lib.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/ert.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-19 15:25:10 +0000
+++ b/lisp/ChangeLog    2012-11-19 17:02:20 +0000
@@ -1,3 +1,7 @@
+2012-11-19  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/ert.el (ert--expand-should-1): Adapt to cl-lib.
+
 2012-11-19  Michael Albinus  <address@hidden>
 
        * net/tramp-sh.el (tramp-do-copy-or-rename-file): If both files

=== modified file 'lisp/emacs-lisp/ert.el'
--- a/lisp/emacs-lisp/ert.el    2012-09-24 15:58:20 +0000
+++ b/lisp/emacs-lisp/ert.el    2012-11-19 17:02:20 +0000
@@ -388,16 +388,11 @@
 (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-")))