1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-23 22:20:24 -08:00

Merge from emacs-24; up to 2012-11-08T14:54:03Z!monnier@iro.umontreal.ca

This commit is contained in:
Glenn Morris 2012-11-10 15:13:33 -08:00
commit 6baf66d53b
41 changed files with 1804 additions and 1005 deletions

View file

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