From: Kenichi Handa <handa@etlken>
Date: Fri, 28 May 2010 06:45:43 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~182
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ad1627dbeb2c525a78252de500cb92ac367d8e2;p=emacs.git

merge trunk
---

0ad1627dbeb2c525a78252de500cb92ac367d8e2
diff --cc src/ChangeLog
index 2d8948f6a31,462eded2b20..eeee6540e68
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,10 -1,25 +1,32 @@@
 +2010-05-28  Kenichi Handa  <handa@m17n.org>
 +
 +	* font.c (font_delete_unmatched): Check Vface_ignored_fonts.
 +	Don't sheck SPEC if it is nil.
 +	(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: