[USE_MAC_TSM] (mac_handle_text_input_event):

Check WINDOWP before using XWINDOW.

diff --git a/src/ChangeLog b/src/ChangeLog
index c87474ba4caef90e9e65872df1a7d80f396f18c3..190d6fb0e3622f504412fbd88f8e4c1952cbf3f6 100644 (file)
--- 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 32abee0bc1015322d177a49b130a6f63085da683..372eff645fd34009f7611200fcde53a1522c0577 100644 (file)
--- 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);