# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1149302075 0
# Node ID 727e23c24e0360ead07af556b7b8b58842c5f93b
# Parent  6ac6b21d26f4b35ed9944cba36fb050f6b532913
*** empty log message ***

diff -r 6ac6b21d26f4 -r 727e23c24e03 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jun 03 02:34:25 2006 +0000
+++ b/lisp/ChangeLog	Sat Jun 03 02:34:35 2006 +0000
@@ -1,3 +1,26 @@
+2006-06-03  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* term/mac-win.el (mac-ts-active-input-overlay): Add defvar.
+	(mac-ae-number, mac-ae-frame, mac-ae-script-language)
+	(mac-bytes-to-text-range, mac-ae-text-range-array)
+	(mac-ts-update-active-input-buf, mac-split-string-by-property-change)
+	(mac-replace-untranslated-utf-8-chars, mac-ts-update-active-input-area)
+	(mac-ts-unicode-for-key-event):	New functions.
+	(mac-handle-toolbar-switch-mode): Use mac-ae-frame.
+	(mac-handle-font-selection): Use mac-ae-number.
+	(mac-ts-active-input-buf, mac-ts-update-active-input-area-seqno):
+	New variables.
+	(mac-ts-caret-position, mac-ts-raw-text, mac-ts-selected-raw-text)
+	(mac-ts-converted-text, mac-ts-selected-converted-text)
+	(mac-ts-block-fill-text, mac-ts-outline-text)
+	(mac-ts-selected-text, mac-ts-no-hilite): New faces.
+	(mac-ts-hilite-style-faces): New constant.
+	(mac-apple-event-map): Bind text input events.
+	(mac-dispatch-apple-event): Use command-execute instead of
+	call-interactively.
+	(global-map): Don't bind mac-apple-event.
+	(special-event-map): Bind mac-apple-event.
+
 2006-06-02  Eli Zaretskii  <eliz@gnu.org>
 
 	* makefile.w32-in (EMACS): Remove quotes from the Emacs executable
diff -r 6ac6b21d26f4 -r 727e23c24e03 src/ChangeLog
--- a/src/ChangeLog	Sat Jun 03 02:34:25 2006 +0000
+++ b/src/ChangeLog	Sat Jun 03 02:34:35 2006 +0000
@@ -1,3 +1,31 @@
+2006-06-03  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macfns.c (x_set_icon_name): Apply 2006-06-02 change for xfns.c.
+
+	* macgui.h (USE_MAC_TSM): Set default to 1 on Mac OS X.
+
+	* macterm.c (tsm_document_id) [USE_MAC_TSM]: New variable.
+	(Qtext_input, Qupdate_active_input_area, Qunicode_for_key_event)
+	[USE_MAC_TSM]: Likewise.
+	(syms_of_macterm) [USE_MAC_TSM]: Intern and staticpro them.
+	(Qbefore_string) [USE_MAC_TSM]: Add extern.
+	(do_app_resume, do_app_suspend) [USE_MAC_TSM]: Call
+	ActivateTSMDocument/DeactivateTSMDocument.
+	(mac_store_event_ref_as_apple_event): Call mac_post_mouse_moved_event.
+	(mac_handle_window_event) [USE_MAC_TSM]: Handle
+	kEventWindowFocusAcquired/kEventWindowFocusRelinquish.
+	(mac_handle_text_input_event) [USE_MAC_TSM]: New function.
+	(install_window_handler) [USE_MAC_TSM]: Install it.  Register
+	kEventWindowFocusAcquired/kEventWindowFocusRelinquish.
+	(keycode_to_xkeysym_table): Add entry for f16.
+	(XTread_socket) [USE_MAC_TSM]: Set/reset read_socket_inev
+	before/after passing keystroke event to toolbox dispatcher.
+	(init_tsm) [USE_MAC_TSM]: New function.
+	(mac_initialize) [USE_MAC_TSM]: Call it.
+	(Vmac_ts_active_input_overlay) [USE_MAC_TSM]: New defvar.
+
+	* macterm.h (EVENT_PARAM_TEXT_INPUT_SEQUENCE_NUMBER): New enumerator.
+
 2006-06-02  John Paul Wallington  <jpw@gnu.org>
 
 	* xfns.c (x_set_name_internal): Set icon to `text', derived from