summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-11-08 09:36:47 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2012-11-08 09:36:47 -0500
commit32170f7ff2f85378cbafd68ea562fc0da7909941 (patch)
tree7048d53a9b53c20e108c0221512526c8c8e6454c /lisp/emacs-lisp
parent4c1f6a5b9d65dceab0126957820f38f677a6821f (diff)
downloademacs-32170f7ff2f85378cbafd68ea562fc0da7909941.tar.gz
emacs-32170f7ff2f85378cbafd68ea562fc0da7909941.tar.bz2
emacs-32170f7ff2f85378cbafd68ea562fc0da7909941.zip
* lisp/emacs-lisp/advice.el: Require `cl-lib' at run-time to fix
miscompilation of trace.el.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/advice.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index bd85238e23e..e358c756712 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -1709,7 +1709,8 @@
;; During a normal load this is a noop:
(require 'advice-preload "advice.el")
(require 'macroexp)
-(eval-when-compile (require 'cl-lib))
+;; At run-time also, since ad-do-advised-functions returns code that uses it.
+(require 'cl-lib)
;; @@ Variable definitions:
;; ========================