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

diff -r 4df3a065ee9b -r b4fb555ddd05 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jun 16 08:08:59 2006 +0000
+++ b/lisp/ChangeLog	Fri Jun 16 08:09:09 2006 +0000
@@ -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 -r 4df3a065ee9b -r b4fb555ddd05 man/ChangeLog
--- a/man/ChangeLog	Fri Jun 16 08:08:59 2006 +0000
+++ b/man/ChangeLog	Fri Jun 16 08:09:09 2006 +0000
@@ -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 -r 4df3a065ee9b -r b4fb555ddd05 src/ChangeLog
--- a/src/ChangeLog	Fri Jun 16 08:08:59 2006 +0000
+++ b/src/ChangeLog	Fri Jun 16 08:09:09 2006 +0000
@@ -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