# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1325867707 0
# Node ID 4050bbef9bf650e5af74d87011d8779621594772
# Parent  07256dcc0c8ba58e01b74b30bd094d2f3915af2a# Parent  a366601407c28912b6f472afb0272d95982e0388
Automated merge with ssh://bitbucket.org/xemacs/xemacs

diff -r 07256dcc0c8b -r 4050bbef9bf6 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jan 03 11:25:06 2012 +0100
+++ b/lisp/ChangeLog	Fri Jan 06 16:35:07 2012 +0000
@@ -1,5 +1,9 @@
 2012-01-02  Aidan Kehoe  <kehoea@parhasard.net>
 
+	* bytecomp.el (cl-compile-time-init): Add an autoload for this,
+	some code supplies -no-autoloads when byte-compiling, making it
+	necessary.
+
 	* obsolete.el (cl-puthash): Put back a compatibility alias for
 	this, setf-expansion of #'gethash calls it on 21.4, so it will
 	occur in packages for a while to come.
diff -r 07256dcc0c8b -r 4050bbef9bf6 lisp/bytecomp.el
--- a/lisp/bytecomp.el	Tue Jan 03 11:25:06 2012 +0100
+++ b/lisp/bytecomp.el	Fri Jan 06 16:35:07 2012 +0000
@@ -5036,6 +5036,9 @@
 	      byte-compile-constant
 	      byte-compile-variable-ref)))))
 
+;;; Some packages byte-compile with -no-autoloads, so this is necessary:
+(autoload 'cl-compile-time-init "cl-macs")
+
 ;; XEmacs; call this explicitly, don't implement it using bytecomp-load-hook.
 (cl-compile-time-init)