From: Kenichi Handa <handa@gnu.org>
Date: Sun, 30 Sep 2012 14:43:39 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.2.90~243
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=34f36ab2477611399e6b537ebd87df839ef09299;p=emacs.git

merge trunk
---

34f36ab2477611399e6b537ebd87df839ef09299
diff --cc src/ChangeLog
index f69ab42bd90,119651e0651..1f5ad1e6d05
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,10 -1,14 +1,19 @@@
 +2012-09-30  Kenichi Handa  <handa@gnu.org>
 +
 +	* coding.c (decode_coding_ccl, encode_coding_ccl): Pay attention
 +	to the buffer relocation which may be caused by ccl_driver.
 +
  2012-09-30  Jan Djärv  <jan.h.d@swipnet.se>
  
+ 	* xfns.c (Fx_file_dialog): Update comment.
+ 
+ 	* w32fns.c (Fx_file_dialog): Update comment.
+ 
+ 	* nsfns.m (Fns_read_file_name): Add argument DIR_ONLY_P.
+ 	Initialize panel name field if OSX >= 10.6.
+ 
+ 	* fileio.c (Fnext_read_file_uses_dialog_p): Add HAVE_NS.
+ 
  	* nsfns.m (ns_frame_parm_handlers): Add x_set_fullscreen.
  
  	* nsterm.m (NEW_STYLE_FS): New define.