*** empty log message ***

2 files changed, 51 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d24de2c4ce..9d4a6d0de47 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 27040e76822..31e235c65cc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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