comparison src/mactoolbox.c @ 80741:1f63840526a9

(mac_handle_text_input_event): Check if display is up to date before accessing current matrix.

80740:038757cf9434

	else
	  {
#ifndef MAC_OSX
	    break;
#else  /* MAC_OSX */
	    CFRange sel_range;
	    int charpos;
	    int hpos, vpos, x, y;
	    struct glyph_row *row;
	    struct glyph *glyph;
	    struct face *face;

	    f = mac_focus_frame (&one_mac_display_info);
	    w = XWINDOW (f->selected_window);
	    mac_get_selected_range (w, &sel_range);
	    charpos = (BUF_BEGV (XBUFFER (w->buffer)) + sel_range.location
		       + byte_offset / (long) sizeof (UniChar));

	    if (!fast_find_position (w, charpos, &hpos, &vpos, &x, &y, Qnil))
	      {
		result = errOffsetInvalid;

80741:1f63840526a9

	else
	  {
#ifndef MAC_OSX
	    break;
#else  /* MAC_OSX */
	    struct buffer *b;
	    CFRange sel_range;
	    int charpos;
	    int hpos, vpos, x, y;
	    struct glyph_row *row;
	    struct glyph *glyph;
	    struct face *face;

	    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 (b) + sel_range.location
		       + byte_offset / (long) sizeof (UniChar));

	    if (!fast_find_position (w, charpos, &hpos, &vpos, &x, &y, Qnil))
	      {
		result = errOffsetInvalid;