*** empty log message ***

2 files changed, 18 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 72ec0b24f3f..418f28e1bd6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * term/mac-win.el: Don't change default directory.
+
 2005-11-22  Luc Teirlinck  <teirllm@auburn.edu>
 
         * cus-edit.el (Custom-reset-standard): Make it handle Custom group
diff --git a/src/ChangeLog b/src/ChangeLog
index 105a03a2b8c..ffb5baf4187 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2005-11-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * emacs.c (main) [MAC_OSX]: Change working directory to home
+        directory if `-psn_*' option is specified.
+
+        * mac.c (DECODE_UTF_8): Remove macro.
+        [TARGET_API_MAC_CARBON] (cfstring_to_lisp_nodecode): New function
+        created from cfstring_to_lisp.
+        [TARGET_API_MAC_CARBON] (cfstring_to_lisp): Use it.
+        (xrm_get_preference_database) [TARGET_API_MAC_CARBON]: Likewise.
+
+        * macterm.h (cfstring_to_lisp_nodecode) [TARGET_API_MAC_CARBON]:
+        Add prototype.
+
 2005-11-21  Ken Raeburn  <raeburn@mit.edu>
 
         * keymap.c (shadow_lookup): Use make_number to pass a number to