[USE_MAC_TSM] (mac_handle_text_input_event):

Check WINDOWP before using XWINDOW.

2 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c87474ba4ca..190d6fb0e36 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-28  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c [USE_MAC_TSM] (mac_handle_text_input_event):
+        Check WINDOWP before using XWINDOW.
+
 2007-06-27  Juanma Barranquero  <lekktu@gmail.com>
 
         * buffer.c (syms_of_buffer) <selective-display>: Fix typo in docstring.
diff --git a/src/macterm.c b/src/macterm.c
index 32abee0bc10..372eff645fd 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -10244,6 +10244,9 @@ mac_handle_text_input_event (next_handler, event, data)
            previous events may change some states about display.  */
         if (NILP (Foverlay_get (Vmac_ts_active_input_overlay, Qbefore_string)))
           {
+            if (!WINDOWP (echo_area_window))
+              return eventNotHandledErr;
+
             /* Active input area is displayed in the echo area.  */
             w = XWINDOW (echo_area_window);
             f = WINDOW_XFRAME (w);