[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110815: * lisp/emacs-lisp/advice.el: Require `cl-lib' at run-time to fix

[Stefan Monnier]

------------------------------------------------------------
revno: 110815
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-11-08 09:36:47 -0500
message:
  * lisp/emacs-lisp/advice.el: Require `cl-lib' at run-time to fix
  miscompilation of trace.el.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/advice.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-08 08:14:23 +0000
+++ b/lisp/ChangeLog    2012-11-08 14:36:47 +0000
@@ -1,3 +1,8 @@
+2012-11-08  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/advice.el: Require `cl-lib' at run-time to fix
+       miscompilation of trace.el.
+
 2012-11-08  Glenn Morris  <address@hidden>
 
        * vc/diff-mode.el (diff-remove-trailing-whitespace): Doc fix.

=== modified file 'lisp/emacs-lisp/advice.el'
--- a/lisp/emacs-lisp/advice.el 2012-10-26 18:01:30 +0000
+++ b/lisp/emacs-lisp/advice.el 2012-11-08 14:36:47 +0000
@@ -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:
 ;; ========================