merge trunk

1 files changed, 22 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2d8948f6a31..eeee6540e68 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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: