# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1219223131 0
# Node ID 1f63840526a91729fee6d548e5cbd2bf54272ba9
# Parent  038757cf94344e0590a52b1edee55ce586b3a9a7
(mac_handle_text_input_event):
Check if display is up to date before accessing current matrix.

diff -r 038757cf9434 -r 1f63840526a9 src/mactoolbox.c
--- a/src/mactoolbox.c	Wed Aug 20 09:05:14 2008 +0000
+++ b/src/mactoolbox.c	Wed Aug 20 09:05:31 2008 +0000
@@ -570,6 +570,7 @@
 #ifndef MAC_OSX
 	    break;
 #else  /* MAC_OSX */
+	    struct buffer *b;
 	    CFRange sel_range;
 	    int charpos;
 	    int hpos, vpos, x, y;
@@ -579,8 +580,17 @@
 
 	    f = mac_focus_frame (&one_mac_display_info);
 	    w = XWINDOW (f->selected_window);
+	    b = XBUFFER (w->buffer);
+
+	    /* Are we in a window whose display is up to date?
+	       And verify the buffer's text has not changed.  */
+	    if (!(EQ (w->window_end_valid, w->buffer)
+		  && XINT (w->last_modified) == BUF_MODIFF (b)
+		  && XINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b)))
+	      break;
+
 	    mac_get_selected_range (w, &sel_range);
-	    charpos = (BUF_BEGV (XBUFFER (w->buffer)) + sel_range.location
+	    charpos = (BUF_BEGV (b) + sel_range.location
 		       + byte_offset / (long) sizeof (UniChar));
 
 	    if (!fast_find_position (w, charpos, &hpos, &vpos, &x, &y, Qnil))