aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2017-04-18 12:52:33 -0400
committerGlenn Morris2017-04-18 12:52:33 -0400
commit491531b20d05a0f2cc747aa01e697a764c34a99d (patch)
treefe2e7d29ed3c1e3a5023205671bd8bb84d6d7a5e
parent861824dbecc96339c68b1e15008a21c31e04721b (diff)
downloademacs-491531b20d05a0f2cc747aa01e697a764c34a99d.tar.gz
emacs-491531b20d05a0f2cc747aa01e697a764c34a99d.zip
Avoid ert test failures
* lisp/emacs-lisp/ert.el (ert--expand-should-1): Avoid errors related to undefined byte-compile-macro-environment. Somehow masked until very recently because loading seq (eg) loads bytecomp. http://hydra.nixos.org/build/51730765
-rw-r--r--lisp/emacs-lisp/ert.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 7eaf33a27dc..f4c61e625d8 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -275,6 +275,7 @@ DATA is displayed to the user and should state the reason for skipping."
275 275
276(defun ert--expand-should-1 (whole form inner-expander) 276(defun ert--expand-should-1 (whole form inner-expander)
277 "Helper function for the `should' macro and its variants." 277 "Helper function for the `should' macro and its variants."
278 (require 'bytecomp) ; FIXME?
278 (let ((form 279 (let ((form
279 (macroexpand form (append byte-compile-macro-environment 280 (macroexpand form (append byte-compile-macro-environment
280 (cond 281 (cond