# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1113470985 0
# Node ID 3b3fa02a294de64c11f5cc0e24dbfbaf69f2d738
# Parent  44bd70f63148a6c3ecb7f1611a3634974c19a67e
*** empty log message ***

diff -r 44bd70f63148 -r 3b3fa02a294d lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Apr 14 09:29:16 2005 +0000
+++ b/lisp/ChangeLog	Thu Apr 14 09:29:45 2005 +0000
@@ -1,3 +1,15 @@
+2005-04-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* international/mule-cmds.el (set-locale-environment): On Mac OS,
+	use preferences AppleLocale and AppleLanguages, and variable
+	mac-system-locale for default locale.  On Mac OS Classic, use
+	mac-system-coding-system for default coding systems.
+
+	* term/mac-win.el: Don't set file-name-coding-system.  Decode
+	variables system-name, emacs-build-system, user-login-name, and
+	user-full-name by mac-system-coding-system on Mac OS Classic.
+	(mac-system-coding-system): New variable.
+
 2005-04-13  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* startup.el (command-line): Handle `xterm-mouse-mode' before
diff -r 44bd70f63148 -r 3b3fa02a294d mac/ChangeLog
--- a/mac/ChangeLog	Thu Apr 14 09:29:16 2005 +0000
+++ b/mac/ChangeLog	Thu Apr 14 09:29:45 2005 +0000
@@ -1,3 +1,8 @@
+2005-04-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* makefile.MPW (NonCarbonLibs): Add LocalesLib.  Delete
+	TextEncodingConverter.
+
 2005-04-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings