# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1132730409 0
# Node ID 0f5d079988035d53fd38bf38b0cfd9efc6ddfffe
# Parent  a9abf9b53bef867aed6bababc6e6c5fd886417c8
*** empty log message ***

diff -r a9abf9b53bef -r 0f5d07998803 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Nov 23 07:19:59 2005 +0000
+++ b/lisp/ChangeLog	Wed Nov 23 07:20:09 2005 +0000
@@ -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 -r a9abf9b53bef -r 0f5d07998803 src/ChangeLog
--- a/src/ChangeLog	Wed Nov 23 07:19:59 2005 +0000
+++ b/src/ChangeLog	Wed Nov 23 07:20:09 2005 +0000
@@ -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