]> code.delx.au - gnu-emacs/commitdiff
merge trunk
authorKenichi Handa <handa@gnu.org>
Sun, 30 Sep 2012 14:43:39 +0000 (23:43 +0900)
committerKenichi Handa <handa@gnu.org>
Sun, 30 Sep 2012 14:43:39 +0000 (23:43 +0900)
1  2 
src/ChangeLog

diff --cc src/ChangeLog
index f69ab42bd90eb7e0ca8142abec6621a04960c68c,119651e065127ede3a7f873dd609200d420d5721..1f5ad1e6d05ee46e05c3a0ff608d9bd02fe6551f
@@@ -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.