diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-11-10 15:13:33 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-11-10 15:13:33 -0800 |
| commit | 6baf66d53bbedd85a443e0d69d1f4311a93f0677 (patch) | |
| tree | 38d7a00d5f7d5aecb86285d334fa15a31e5fbab1 /lisp/emacs-lisp/advice.el | |
| parent | 05a859c1bd9cd07b2c0fad06a0694e88ea929fcf (diff) | |
| parent | e4e46889223296e8875548d278340b21db449a4a (diff) | |
| download | emacs-6baf66d53bbedd85a443e0d69d1f4311a93f0677.tar.gz emacs-6baf66d53bbedd85a443e0d69d1f4311a93f0677.tar.bz2 emacs-6baf66d53bbedd85a443e0d69d1f4311a93f0677.zip | |
Merge from emacs-24; up to 2012-11-08T14:54:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/emacs-lisp/advice.el')
| -rw-r--r-- | lisp/emacs-lisp/advice.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 42c25a4613d..8239522c0f8 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: ;; ======================== |