changeset 5638:4050bbef9bf6

Automated merge with ssh://bitbucket.org/xemacs/xemacs
author Aidan Kehoe <kehoea@parhasard.net>
date Fri, 06 Jan 2012 16:35:07 +0000
parents 07256dcc0c8b (current diff) a366601407c2 (diff)
children 1d1f385c9149
files
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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)