# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1115991263 0
# Node ID 5401d9510369bcbaa5577cd6da8a273ef6171135
# Parent  3302236fcb6003ad9b38b2751c148d8fce9590a8
*** empty log message ***

diff -r 3302236fcb60 -r 5401d9510369 src/ChangeLog
--- a/src/ChangeLog	Fri May 13 13:33:53 2005 +0000
+++ b/src/ChangeLog	Fri May 13 13:34:23 2005 +0000
@@ -1,3 +1,11 @@
+2005-05-13  Richard M. Stallman  <rms@gnu.org>
+
+	* fileio.c (Ffind_file_name_handler): Handle lambda-exp as handler.
+	(Finsert_file_contents): If we read 0 bytes from a special file,
+	unlock the visited file if we locked it.
+	(Fmake_symbolic_link, Frecent_auto_save_p): Doc fixes.
+	(Ffile_exists_p, Ffile_symlink_p): Doc fixes. 
+
 2005-05-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* emacs.c (main) [MAC_OS8]: Call init_atimer before mac_term_init.
@@ -43,6 +51,7 @@
 	(unexec_malloc, unexec_realloc, unexec_free): Store and use
 	allocated size information in unexec_malloc_header.
 
+>>>>>>> 1.4385
 2005-05-10  Richard M. Stallman  <rms@gnu.org>
 
 	* xterm.c (noinclude): Add #undef.