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

miscompilation of trace.el.

* lisp/emacs-lisp/advice.el: Require `cl-lib' at run-time to fix
miscompilation of trace.el.
32170f7f · Stefan Monnier · 4c1f6a5b · 32170f7f · 32170f7f
Commit 32170f7f authored Nov 08, 2012 by Stefan Monnier
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +5 -0

lisp/emacs-lisp/advice.el lisp/emacs-lisp/advice.el +2 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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.

--- 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:
 ;; ========================