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

miscompilation of trace.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b141afe67e691009f35296ec32487aaeaf8c217d..b17f3d9a59e35afb3c53e5e79bf34c7e411062ec 100644 (file)
--- 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 bd85238e23e9ff81015ae69ba54baa917e258ecf..e358c756712a8134c41d566f4623eda0b1fd5ed6 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:
 ;; ========================