Merge from emacs-24; up to 2012-11-08T14:54:03Z!monnier@iro.umontreal.ca

[gnu-emacs] / lisp / emacs-lisp / advice.el

diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 42c25a4613df201bf44817fe2fc0c36aeebbee06..8239522c0f8e2246b46eb2549f201abf16de0372 100644 (file)
--- 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:
 ;; ========================