* lisp/emacs-lisp/advice.el: Require `cl-lib' at run-time to fix

miscompilation of trace.el.

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b141afe67e6..b17f3d9a59e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/advice.el: Require `cl-lib' at run-time to fix
+        miscompilation of trace.el.
+
 2012-11-08  Glenn Morris  <rgm@gnu.org>
 
         * vc/diff-mode.el (diff-remove-trailing-whitespace): Doc fix.
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:
 ;; ========================