--- a/lisp/ChangeLog	Sat Jan 22 00:59:20 2011 +0100
+++ b/lisp/ChangeLog	Mon Feb 07 21:22:17 2011 +0100
@@ -1,3 +1,82 @@
+2011-02-07  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* bytecomp.el:
+	* bytecomp.el (byte-compile-initial-macro-environment):
+	Shadow `block', `return-from' here, we implement them differently
+	when byte-compiling.
+
+	* bytecomp.el (byte-compile-active-blocks): New.
+	* bytecomp.el (byte-compile-block-1): New.
+	* bytecomp.el (byte-compile-return-from-1): New.
+	* bytecomp.el (return-from-1): New.
+	* bytecomp.el (block-1): New.
+	These are two aliases that exist to have their own associated
+	byte-compile functions, which functions implement `block' and
+	`return-from'.
+
+	* cl-extra.el (cl-macroexpand-all):
+	Fix a bug here when macros in the environment have been compiled.
+
+	* cl-macs.el (block):
+	* cl-macs.el (return):
+	* cl-macs.el (return-from):
+	Be more careful about lexical scope in these macros.
+
+	* cl.el:
+	* cl.el ('cl-block-wrapper): Removed.
+	* cl.el ('cl-block-throw): Removed.
+	These aren't needed in code generated by this XEmacs. They
+	shouldn't be needed in code generated by XEmacs 21.4, but if it
+	turns out the packages do need them, we can put them back.
+
+2011-01-30  Mike Sperber  <mike@xemacs.org>
+
+	* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
+	`font-lock-mode' is unset, which can happen in the middle of
+	`revert-buffer'.
+
+2011-01-23  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* cl-macs.el (delete):
+	* cl-macs.el (delq):
+	* cl-macs.el (remove):
+	* cl-macs.el (remq):
+	Don't use the compiler macro if these functions were given the
+	wrong number of arguments, as happens in lisp-tests.el.
+	* cl-seq.el (remove, remq): Removed.
+	I added these to subr.el, and forgot to remove them from here.
+
+2011-01-22  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* bytecomp.el (byte-compile-setq, byte-compile-set):
+	Remove kludge allowing keywords' values to be set, all the code
+	that does that is gone.
+
+	* cl-compat.el (elt-satisfies-test-p):
+	* faces.el (set-face-parent):
+	* faces.el (face-doc-string):
+	* gtk-font-menu.el:
+	* gtk-font-menu.el (gtk-reset-device-font-menus):
+	* msw-font-menu.el:
+	* msw-font-menu.el (mswindows-reset-device-font-menus):
+	* package-get.el (package-get-installedp):
+	* select.el (select-convert-from-image-data):
+	* sound.el:
+	* sound.el (load-sound-file):
+	* x-font-menu.el (x-reset-device-font-menus-core):
+	Don't quote keywords, they're self-quoting, and the
+	win from backward-compatibility is sufficiently small now that the
+	style problem overrides it.
+
+2011-01-22  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* cl-macs.el (block, return-from): Require that NAME be a symbol
+	in these macros, as always documented in the #'block docstring and
+	as required by Common Lisp.
+	* descr-text.el (unidata-initialize-unihan-database):
+	Correct the use of non-symbols in #'block and #'return-from in
+	this function.
+
 2011-01-15  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* cl-extra.el (concatenate): Accept more complicated TYPEs in this