Do not assume #'format-decode exists in fileio.c. src/ChangeLog addition: 2010-02-07 Aidan Kehoe <kehoea@parhasard.net> * fileio.c (Finsert_file_contents_internal): Only call format-decode if it has a function binding. (build_annotations): Only call format-annotate-function if it has a function binding; incidentally only calling #'car-less-than-car if *it* has a function binding. (syms_of_fileio): #'car-less-than-car and #'cdr-less-than-cdr are now in Lisp. lisp/ChangeLog addition: 2010-02-07 Aidan Kehoe <kehoea@parhasard.net> * make-docfile.el (format-decode): Remove this temporary function definition, now we check the symbol is bound in fileio.c * version.el (format-decode): Ditto. * format.el (car-less-than-car, cdr-less-than-cdr): Move these here from fileio.c, now they are only called once format.el is available.

--- a/src/ChangeLog	Sun Feb 07 14:37:35 2010 +0000
+++ b/src/ChangeLog	Sun Feb 07 23:31:50 2010 +0000
@@ -1,3 +1,13 @@
+2010-02-07  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* fileio.c (Finsert_file_contents_internal):
+	Only call format-decode if it has a function binding.
+	(build_annotations): Only call format-annotate-function if it has
+	a function binding; incidentally only calling #'car-less-than-car
+	if *it* has a function binding.
+	(syms_of_fileio): #'car-less-than-car and #'cdr-less-than-cdr are
+	now in Lisp.
+
 2010-02-07  Ben Wing  <ben@xemacs.org>
 
 	* fns.c: Qlist, Qstring mistakenly declared twice.