*** empty log message ***

3 files changed, 27 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 80f1b26291a..7e2e062ebd2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * cus-start.el (all): Add mac-ts-script-language-on-focus.
+
+        * term/mac-win.el (mac-text-encoding-ascii): New constant.
+        (mac-utxt-to-string): Use it.
+        (mac-ts-update-active-input-area): Use mac-ae-number.
+
 2006-06-15  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * term.el (term-handle-scroll, term-delete-lines)
diff --git a/man/ChangeLog b/man/ChangeLog
index f2aa8265c22..627f528de85 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macos.texi (Mac Input): Add description of mac-function-modifier.
+        Now Unicode keyboard layouts work.
+
 2006-06-10  Carsten Dominik  <dominik@science.uva.nl>
 
         * org.texi: (Progress logging): New section.
diff --git a/src/ChangeLog b/src/ChangeLog
index ffafa71e53f..a6dd3de7139 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2006-06-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c (Fx_display_mm_height, Fx_display_mm_width)
+        [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]: Use CGDisplayScreenSize.
+
+        * macterm.c (do_app_resume, do_app_suspend): Remove functions.
+        (mac_tsm_resume, mac_tsm_suspend) [USE_MAC_TSM]: New functions.
+        (mac_handle_window_event, XTread_socket) [USE_MAC_TSM]: Use them.
+        (Vmac_ts_script_language_on_focus) [USE_MAC_TSM]: New variable.
+        (syms_of_macterm) [USE_MAC_TSM]: Defvar it.
+        (saved_ts_language, saved_ts_component) [USE_MAC_TSM]: New variables.
+        (mac_initialize_display_info) [MAC_OSX]: Use Quartz Display
+        Services functions to get size of main display in pixels.
+
 2006-06-14  Chong Yidong  <cyd@stupidchicken.com>
 
         * xdisp.c (back_to_previous_visible_line_start): Reset