--- a/src/ChangeLog	Sun Apr 04 23:46:50 2010 -0500
+++ b/src/ChangeLog	Mon Apr 05 00:18:49 2010 -0500
@@ -72,6 +72,56 @@
 	New function for doing printf-like formatting involving Lisp objects
 	and outputting to the debug output.
 
+2010-04-03  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* fns.c (Ffill):
+	Be much more careful about resizing a string argument, update
+	pointers to within the string data that may have been relocated
+	with the string resize. Fixes a test hang reported by Vin Shelton;
+	thanks, Vin.
+
+2010-04-02  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* fns.c (FsortX, Ffill):
+	Don't try to be clever with the ascii_begin string header slot in
+	these function, just call init_string_ascii_begin().
+
+2010-04-02  Aidan Kehoe  <kehoea@parhasard.net>
+
+	Avoid build failure, Apple's g++-4.0.1, Mac OS 10.4.
+	* sysdll.c (search_linked_libs, dll_variable): Correct some casts
+	for the C++ build.
+	* regex.h (END_C_DECLS, BEGIN_C_DECLS): Wrap function declarations
+	in extern "C" { ... } on the C++ build.
+	* mule-ccl.c (ccl_driver): Initialise i, silencing a warning on
+	a C++ build.
+	* keymap.c (key_desc_list_to_event):
+	Work around a bug in Apple's g++-4.0.1.
+
+2010-03-31  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* fns.c (STRING_DATA_TO_OBJECT_ARRAY)
+	(BIT_VECTOR_TO_OBJECT_ARRAY, c_merge_predicate_key)
+	(c_merge_predicate_nokey, list_merge, array_merge)
+	(list_array_merge_into_list, list_list_merge_into_array)
+	(list_array_merge_into_array, CHECK_KEY_ARGUMENT, Fmerge)
+	(list_sort, array_sort, FsortX):
+	Move #'sort*, #'fill, #'merge from cl-seq.el to C, extending the
+	implementations of Fsort, Ffillarray, and merge() to do so.
+
+	* keymap.c (keymap_submaps, map_keymap_sort_predicate)
+	(describe_map_sort_predicate):
+	Change the calling semantics of the C sort predicates to return a
+	non-nil Lisp object if the first argument is less than the second,
+	rather than C integers.
+
+	* fontcolor-msw.c (sort_font_list_function): 
+	* fileio.c (build_annotations):
+	* dired.c (Fdirectory_files):
+	* abbrev.c (Finsert_abbrev_table_description):
+	Call list_sort instead of Fsort, list_merge instead of merge() in
+	these functions.
+
 2010-03-29  Ben Wing  <ben@xemacs.org>
 
 	* lisp.h (PRIVATE_UNVERIFIED_LIST_LOOP_7):