From 32170f7ff2f85378cbafd68ea562fc0da7909941 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 8 Nov 2012 09:36:47 -0500 Subject: [PATCH] * lisp/emacs-lisp/advice.el: Require `cl-lib' at run-time to fix miscompilation of trace.el. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/advice.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + * emacs-lisp/advice.el: Require `cl-lib' at run-time to fix + miscompilation of trace.el. + 2012-11-08 Glenn Morris * 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: ;; ======================== -- 2.39.5