*** empty log message ***

2 files changed, 17 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ce2aa28373..821a1444484 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/mac/ChangeLog b/mac/ChangeLog
index 9a1ded737ff..4d3dba217d3 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -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