*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ce2aa283731a7f582e724f4265ce30bc1c40711..821a14444840296207bfaf053415d5c59f8fd821 100644 (file)
--- 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 9a1ded737ff4f3ab3e6f25126fb1a1577ef3b642..4d3dba217d3aa55db52a4e13c96f31015e970445 100644 (file)
--- 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