Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

2 files changed, 5 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8efc90727e1..1df4f6ae0ba 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -57,6 +57,10 @@
         * emacs.c (syms_of_emacs) <system-configuration>: Doc fix.
         (Bug#19502)
 
+2015-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp.mk (lisp): Add cl-preloaded.
+
 2015-01-27  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use bool for boolean in xfaces.c
diff --git a/src/lisp.mk b/src/lisp.mk
index a9deb2b53d9..ee2a07c0fd7 100644
--- a/src/lisp.mk
+++ b/src/lisp.mk
@@ -71,6 +71,7 @@ lisp = \
         $(lispsource)/faces.elc \
         $(lispsource)/button.elc \
         $(lispsource)/startup.elc \
+        $(lispsource)/emacs-lisp/cl-preloaded.elc \
         $(lispsource)/emacs-lisp/nadvice.elc \
         $(lispsource)/minibuffer.elc \
         $(lispsource)/abbrev.elc \