diff src/ChangeLog @ 108814:9d7ea82188d8

merge trunk
author Kenichi Handa <handa@etlken>
date Fri, 28 May 2010 15:45:43 +0900
parents f1ee344e1eb5 ff6d69344057
children 6515310887ec d54e74c34f05
line wrap: on
line diff
--- a/src/ChangeLog	Fri May 28 15:42:43 2010 +0900
+++ b/src/ChangeLog	Fri May 28 15:45:43 2010 +0900
@@ -5,6 +5,28 @@
 	(font_list_entities): Call font_delete_unmatched if
 	Vface_ignored_fonts is non-nil.
 
+2010-05-28  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (LIBES): Remove $LOADLIBES, it is never set.
+
+2010-05-27  Chong Yidong  <cyd@stupidchicken.com>
+
+	* fileio.c (Fdelete_file): Change meaning of optional arg to mean
+	whether to trash.
+	(internal_delete_file, Frename_file): Callers changed.
+	(delete_by_moving_to_trash): Doc fix.
+	(Fdelete_directory_internal): Don't move to trash.
+
+	* callproc.c (delete_temp_file):
+	* buffer.c (Fkill_buffer): Callers changed.
+
+	* lisp.h: Update prototype.
+
+2010-05-27  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xdisp.c (redisplay_window): After redisplay, check if point is
+	still valid before setting it (Bug#6177).
+
 2010-05-27  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in, autodeps.mk, deps.mk, ns.mk: