comparison src/xdisp.c @ 83531:a387c138b28e

Merged from [e-mail] Patches applied: * [e-mail]/emacs--devo--0--patch-305 Update from CVS * [e-mail]/emacs--devo--0--patch-306 Update from CVS * [e-mail]/emacs--devo--0--patch-307 Update from CVS: lispref/display.texi (Forcing Redisplay): Fix typo. * [e-mail]/emacs--devo--0--patch-308 Update from CVS * [e-mail]/emacs--devo--0--patch-309 Update from CVS * [e-mail]/emacs--devo--0--patch-310 Update from CVS * [e-mail]/emacs--devo--0--patch-311 Update from CVS * [e-mail]/emacs--devo--0--patch-312 Update from CVS * [e-mail]/emacs--devo--0--patch-313 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-314 Update from CVS * [e-mail]/emacs--devo--0--patch-315 Update from CVS * [e-mail]/emacs--devo--0--patch-316 Update from CVS * [e-mail]/emacs--devo--0--patch-317 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-318 Update from CVS * [e-mail]/emacs--devo--0--patch-319 Update from CVS * [e-mail]/emacs--devo--0--patch-320 Update from CVS * [e-mail]/emacs--devo--0--patch-321 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-322 Update from CVS * [e-mail]/emacs--devo--0--patch-323 lisp/play/cookie1.el (cookie): Work properly when there's only one entry * [e-mail]/emacs--devo--0--patch-324 Update from CVS * [e-mail]/emacs--devo--0--patch-325 Update from CVS * [e-mail]/emacs--devo--0--patch-326 Update from CVS * [e-mail]/emacs--devo--0--patch-327 Update from CVS * [e-mail]/emacs--devo--0--patch-328 Update from CVS * [e-mail]/emacs--devo--0--patch-329 Update from CVS * [e-mail]/emacs--devo--0--patch-330 Update from CVS * [e-mail]/gnus--rel--5.10--patch-105 Update from CVS * [e-mail]/gnus--rel--5.10--patch-106 Update from CVS * [e-mail]/gnus--rel--5.10--patch-107 Update from CVS * [e-mail]/gnus--rel--5.10--patch-108 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-109 Clean up merge mistakes * [e-mail]/gnus--rel--5.10--patch-110 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-571

83530:46b1096093f5

static int display_string P_ ((unsigned char *, Lisp_Object, Lisp_Object,
			       int, int, struct it *, int, int, int, int));
static void compute_line_metrics P_ ((struct it *));
static void run_redisplay_end_trigger_hook P_ ((struct it *));
static int get_overlay_strings P_ ((struct it *, int));
static void next_overlay_string P_ ((struct it *));
static void reseat P_ ((struct it *, struct text_pos, int));
static void reseat_1 P_ ((struct it *, struct text_pos, int));
static void back_to_previous_visible_line_start P_ ((struct it *));
void reseat_at_previous_visible_line_start P_ ((struct it *));

	 POS, make sure to pop the iterator because it will be in
	 front of that overlay string.  When POS is ZV, we've thereby
	 also ``processed'' overlay strings at ZV.  */
      while (it->sp)
	pop_it (it);
      it->current.overlay_string_index = -1;
      it->method = GET_FROM_BUFFER;
      if (CHARPOS (pos->pos) == ZV)
	it->overlay_strings_at_end_processed_p = 1;
    }
#endif /* 0 */

	  handled = p->handler (it);

	  if (handled == HANDLED_RECOMPUTE_PROPS)
	    break;
	  else if (handled == HANDLED_RETURN)
	    return;
	  else if (handled == HANDLED_OVERLAY_STRING_CONSUMED)
	    handle_overlay_change_p = 0;
	}

      if (handled != HANDLED_RECOMPUTE_PROPS)

		  IT_CHARPOS (*it) = end;
		  IT_BYTEPOS (*it) = CHAR_TO_BYTE (end);
		}
	      return HANDLED_RECOMPUTE_PROPS;
	    }
	  it->method = GET_FROM_COMPOSITION;
	  it->cmp_id = id;
	  it->cmp_len = COMPOSITION_LENGTH (prop);
	  /* For a terminal, draw only the first character of the
             components.  */

	 they were before overlay strings were processed, and
	 continue to deliver from current_buffer.  */
      int display_ellipsis_p = it->stack[it->sp - 1].display_ellipsis_p;

      pop_it (it);
      xassert (it->stop_charpos >= BEGV
	       && it->stop_charpos <= it->end_charpos);
      it->string = Qnil;
      it->current.overlay_string_index = -1;
      SET_TEXT_POS (it->current.string_pos, -1, -1);
      it->n_overlay_strings = 0;
      it->method = GET_FROM_BUFFER;

      /* If we're at the end of the buffer, record that we have
	 processed the overlay strings there already, so that
	 next_element_from_buffer doesn't try it again.  */
      if (IT_CHARPOS (*it) >= it->end_charpos)

/* Get the first chunk of overlay strings at IT's current buffer
   position, or at CHARPOS if that is > 0.  Value is non-zero if at
   least one overlay string was found.  */

static int
get_overlay_strings (it, charpos)
     struct it *it;
     int charpos;
{
  /* Get the first OVERLAY_STRING_CHUNK_SIZE overlay strings to
     process.  This fills IT->overlay_strings with strings, and sets

  if (it->n_overlay_strings)
    {
      /* Make sure we know settings in current_buffer, so that we can
	 restore meaningful values when we're done with the overlay
	 strings.  */
      compute_stop_pos (it);
      xassert (it->face_id >= 0);

      /* Save IT's settings.  They are restored after all overlay
	 strings have been processed.  */
      xassert (it->sp == 0);
      push_it (it);

      /* Set up IT to deliver display elements from the first overlay
	 string.  */
      IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0;

      it->stop_charpos = 0;
      xassert (STRINGP (it->string));
      it->end_charpos = SCHARS (it->string);
      it->multibyte_p = STRING_MULTIBYTE (it->string);
      it->method = GET_FROM_STRING;
    }
  else
    {
      it->string = Qnil;
      it->current.overlay_string_index = -1;
      it->method = GET_FROM_BUFFER;
    }

  CHECK_IT (it);

  /* Value is non-zero if we found at least one overlay string.  */
  return STRINGP (it->string);

push_it (it)
     struct it *it;
{
  struct iterator_stack_entry *p;

  xassert (it->sp < 2);
  p = it->stack + it->sp;

  p->stop_charpos = it->stop_charpos;
  xassert (it->face_id >= 0);
  p->face_id = it->face_id;
  p->string = it->string;
  p->pos = it->current;
  p->end_charpos = it->end_charpos;
  p->string_nchars = it->string_nchars;
  p->area = it->area;
  p->multibyte_p = it->multibyte_p;
  p->slice = it->slice;
  p->space_width = it->space_width;
  p->font_height = it->font_height;
  p->voffset = it->voffset;
  p->string_from_display_prop_p = it->string_from_display_prop_p;
  p->display_ellipsis_p = 0;

  xassert (it->sp > 0);
  --it->sp;
  p = it->stack + it->sp;
  it->stop_charpos = p->stop_charpos;
  it->face_id = p->face_id;
  it->string = p->string;
  it->current = p->pos;
  it->end_charpos = p->end_charpos;
  it->string_nchars = p->string_nchars;
  it->area = p->area;
  it->multibyte_p = p->multibyte_p;
  it->slice = p->slice;
  it->space_width = p->space_width;
  it->font_height = p->font_height;
  it->voffset = p->voffset;
  it->string_from_display_prop_p = p->string_from_display_prop_p;
}

     struct it *it;
{
  while (IT_CHARPOS (*it) > BEGV)
    {
      back_to_previous_line_start (it);
      if (IT_CHARPOS (*it) <= BEGV)
	break;

      /* If selective > 0, then lines indented more than that values
	 are invisible.  */

				     Qinvisible, it->window);
	if (TEXT_PROP_MEANS_INVISIBLE (prop))
	  continue;
      }

      /* If newline has a display property that replaces the newline with something
	 else (image or text), find start of overlay or interval and continue search
	 from that point.  */
      if (IT_CHARPOS (*it) > BEGV)
	{
	  struct it it2 = *it;
	  int pos;
	  int beg, end;
	  Lisp_Object val, overlay;

	  pos = --IT_CHARPOS (it2);
	  --IT_BYTEPOS (it2);
	  it2.sp = 0;
	  if (handle_display_prop (&it2) == HANDLED_RETURN
	      && !NILP (val = get_char_property_and_overlay
			(make_number (pos), Qdisplay, Qnil, &overlay))
	      && (OVERLAYP (overlay)
		  ? (beg = OVERLAY_POSITION (OVERLAY_START (overlay)))
		  : get_property_and_range (pos, Qdisplay, &val, &beg, &end, Qnil)))
	    {
	      if (beg < BEGV)
		beg = BEGV;
	      IT_CHARPOS (*it) = beg;
	      IT_BYTEPOS (*it) = buf_charpos_to_bytepos (current_buffer, beg);
	      continue;
	    }
	}

      break;
    }

  xassert (IT_CHARPOS (*it) >= BEGV);
  xassert (IT_CHARPOS (*it) == BEGV
	   || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
  CHECK_IT (it);

  it->current.overlay_string_index = -1;
  IT_STRING_CHARPOS (*it) = -1;
  IT_STRING_BYTEPOS (*it) = -1;
  it->string = Qnil;
  it->method = GET_FROM_BUFFER;
  /* RMS: I added this to fix a bug in move_it_vertically_backward
     where it->area continued to relate to the starting point
     for the backward motion.  Bug report from
     Nick Roberts <[e-mail]> on 19 May 2003.
     However, I am not sure whether reseat still does the right thing
     in general after this change.  */
  it->area = TEXT_AREA;
  it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
  it->sp = 0;
  it->face_before_selective_p = 0;

  if (set_stop_p)
    it->stop_charpos = CHARPOS (pos);
}

	}
      break;

    case GET_FROM_COMPOSITION:
      xassert (it->cmp_id >= 0 && it->cmp_id < n_compositions);
      if (STRINGP (it->string))
	{
	  IT_STRING_BYTEPOS (*it) += it->len;
	  IT_STRING_CHARPOS (*it) += it->cmp_len;
	  it->method = GET_FROM_STRING;
	  goto consider_string_end;
	}
      else
	{
	  IT_BYTEPOS (*it) += it->len;
	  IT_CHARPOS (*it) += it->cmp_len;
	  it->method = GET_FROM_BUFFER;
	}
      break;

    case GET_FROM_C_STRING:
      /* Current display element of IT is from a C string.  */

	  if (it->s)
	    it->method = GET_FROM_C_STRING;
	  else if (STRINGP (it->string))
	    it->method = GET_FROM_STRING;
	  else
	    it->method = GET_FROM_BUFFER;

	  it->dpvec = NULL;
	  it->current.dpvec_index = -1;

	  /* Skip over characters which were displayed via IT->dpvec.  */

	     string, this time an overlay string, or a buffer.  */
	  if (IT_STRING_CHARPOS (*it) == SCHARS (it->string)
	      && it->sp > 0)
	    {
	      pop_it (it);
	      if (STRINGP (it->string))
		goto consider_string_end;
	      it->method = GET_FROM_BUFFER;
	    }
	}
      break;

    case GET_FROM_IMAGE:

      /* The position etc with which we have to proceed are on
	 the stack.  The position may be at the end of a string,
         if the `display' property takes up the whole string.  */
      xassert (it->sp > 0);
      pop_it (it);
      it->image_id = 0;
      if (STRINGP (it->string))
	{
	  it->method = GET_FROM_STRING;
	  goto consider_string_end;
	}
      it->method = GET_FROM_BUFFER;
      break;

    default:
      /* There are no other methods defined, so this should be a bug.  */
      abort ();

	 face we find after the invisible text.  Remember what it
	 was in IT->saved_face_id, and signal that it's there by
	 setting face_before_selective_p.  */
      it->saved_face_id = it->face_id;
      it->method = GET_FROM_BUFFER;
      reseat_at_next_visible_line_start (it, 1);
      it->face_before_selective_p = 1;
    }

  return get_next_display_element (it);

  it->position = (STRINGP (it->string)
		  ? it->current.string_pos
		  : it->current.pos);
  if (STRINGP (it->string))
    it->object = it->string;
  return 1;
}




	      cursor = 0;
	    }
	}
      else
	{
	  string_before_pos = last_pos;
	  string_start = glyph;
	  string_start_x = x;
	  /* Skip all glyphs from string.  */
	  do
	    {
	      Lisp_Object cprop;
	      int pos;

	 are from string.  As there's no easy way to know the
	 character position of the current glyph, find the correct
	 glyph on point by scanning from string_start again.  */
      Lisp_Object limit;
      Lisp_Object string;
      int pos;

      limit = make_number (pt_old + 1);
      end = glyph;
      glyph = string_start;
      x = string_start_x;
      string = glyph->object;
      pos = string_buffer_position (w, string, string_before_pos);
      /* If STRING is from overlay, LAST_POS == 0.  We skip such glyphs
	 because we always put cursor after overlay strings.  */
      while (pos == 0 && glyph < end)
	{
	  string = glyph->object;
	  SKIP_GLYPHS (glyph, end, x, EQ (glyph->object, string));
	  if (glyph < end)
	    pos = string_buffer_position (w, glyph->object, string_before_pos);
	}

      while (glyph < end)
	{
	  pos = XINT (Fnext_single_char_property_change
		      (make_number (pos), Qdisplay, Qnil, limit));
	  if (pos > pt_old)
	    break;
	  /* Skip glyphs from the same string.  */
	  string = glyph->object;
	  SKIP_GLYPHS (glyph, end, x, EQ (glyph->object, string));
	  /* Skip glyphs from an overlay.  */
	  while (glyph < end
		 && ! string_buffer_position (w, glyph->object, pos))
	    {
	      string = glyph->object;
	      SKIP_GLYPHS (glyph, end, x, EQ (glyph->object, string));
	    }
	}

      /* If we reached the end of the line, and end was from a string,
	 cursor is not on this line.  */

83531:a387c138b28e

static int display_string P_ ((unsigned char *, Lisp_Object, Lisp_Object,
			       int, int, struct it *, int, int, int, int));
static void compute_line_metrics P_ ((struct it *));
static void run_redisplay_end_trigger_hook P_ ((struct it *));
static int get_overlay_strings P_ ((struct it *, int));
static int get_overlay_strings_1 P_ ((struct it *, int, int));
static void next_overlay_string P_ ((struct it *));
static void reseat P_ ((struct it *, struct text_pos, int));
static void reseat_1 P_ ((struct it *, struct text_pos, int));
static void back_to_previous_visible_line_start P_ ((struct it *));
void reseat_at_previous_visible_line_start P_ ((struct it *));

	 POS, make sure to pop the iterator because it will be in
	 front of that overlay string.  When POS is ZV, we've thereby
	 also ``processed'' overlay strings at ZV.  */
      while (it->sp)
	pop_it (it);
      xassert (it->current.overlay_string_index == -1);
      xassert (it->method == GET_FROM_BUFFER);
      if (CHARPOS (pos->pos) == ZV)
	it->overlay_strings_at_end_processed_p = 1;
    }
#endif /* 0 */

	  handled = p->handler (it);

	  if (handled == HANDLED_RECOMPUTE_PROPS)
	    break;
	  else if (handled == HANDLED_RETURN)
	    {
	      /* We still want to show before and after strings from
		 overlays even if the actual buffer text is replaced.  */
	      if (!handle_overlay_change_p || it->sp > 1)
		return;
	      if (!get_overlay_strings_1 (it, 0, 0))
		return;
	      it->ignore_overlay_strings_at_pos_p = 1;
	      it->string_from_display_prop_p = 0;
	      handle_overlay_change_p = 0;
	      handled = HANDLED_RECOMPUTE_PROPS;
	      break;
	    }
	  else if (handled == HANDLED_OVERLAY_STRING_CONSUMED)
	    handle_overlay_change_p = 0;
	}

      if (handled != HANDLED_RECOMPUTE_PROPS)

		  IT_CHARPOS (*it) = end;
		  IT_BYTEPOS (*it) = CHAR_TO_BYTE (end);
		}
	      return HANDLED_RECOMPUTE_PROPS;
	    }

	  push_it (it);
	  it->method = GET_FROM_COMPOSITION;
	  it->cmp_id = id;
	  it->cmp_len = COMPOSITION_LENGTH (prop);
	  /* For a terminal, draw only the first character of the
             components.  */

	 they were before overlay strings were processed, and
	 continue to deliver from current_buffer.  */
      int display_ellipsis_p = it->stack[it->sp - 1].display_ellipsis_p;

      pop_it (it);
      xassert (it->sp > 0
	       || it->method == GET_FROM_COMPOSITION
	       || (NILP (it->string)
		   && it->method == GET_FROM_BUFFER
		   && it->stop_charpos >= BEGV
		   && it->stop_charpos <= it->end_charpos));
      it->current.overlay_string_index = -1;
      it->n_overlay_strings = 0;

      /* If we're at the end of the buffer, record that we have
	 processed the overlay strings there already, so that
	 next_element_from_buffer doesn't try it again.  */
      if (IT_CHARPOS (*it) >= it->end_charpos)

/* Get the first chunk of overlay strings at IT's current buffer
   position, or at CHARPOS if that is > 0.  Value is non-zero if at
   least one overlay string was found.  */

static int
get_overlay_strings_1 (it, charpos, compute_stop_p)
     struct it *it;
     int charpos;
{
  /* Get the first OVERLAY_STRING_CHUNK_SIZE overlay strings to
     process.  This fills IT->overlay_strings with strings, and sets

  if (it->n_overlay_strings)
    {
      /* Make sure we know settings in current_buffer, so that we can
	 restore meaningful values when we're done with the overlay
	 strings.  */
      if (compute_stop_p)
	compute_stop_pos (it);
      xassert (it->face_id >= 0);

      /* Save IT's settings.  They are restored after all overlay
	 strings have been processed.  */
      xassert (!compute_stop_p || it->sp == 0);
      push_it (it);

      /* Set up IT to deliver display elements from the first overlay
	 string.  */
      IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0;

      it->stop_charpos = 0;
      xassert (STRINGP (it->string));
      it->end_charpos = SCHARS (it->string);
      it->multibyte_p = STRING_MULTIBYTE (it->string);
      it->method = GET_FROM_STRING;
      return 1;
    }

  it->current.overlay_string_index = -1;
  return 0;
}

static int
get_overlay_strings (it, charpos)
     struct it *it;
     int charpos;
{
  it->string = Qnil;
  it->method = GET_FROM_BUFFER;

  (void) get_overlay_strings_1 (it, charpos, 1);

  CHECK_IT (it);

  /* Value is non-zero if we found at least one overlay string.  */
  return STRINGP (it->string);

push_it (it)
     struct it *it;
{
  struct iterator_stack_entry *p;

  xassert (it->sp < IT_STACK_SIZE);
  p = it->stack + it->sp;

  p->stop_charpos = it->stop_charpos;
  xassert (it->face_id >= 0);
  p->face_id = it->face_id;
  p->string = it->string;
  p->method = it->method;
  switch (p->method)
    {
    case GET_FROM_IMAGE:
      p->u.image.object = it->object;
      p->u.image.image_id = it->image_id;
      p->u.image.slice = it->slice;
      break;
    case GET_FROM_COMPOSITION:
      p->u.comp.object = it->object;
      p->u.comp.c = it->c;
      p->u.comp.len = it->len;
      p->u.comp.cmp_id = it->cmp_id;
      p->u.comp.cmp_len = it->cmp_len;
      break;
    case GET_FROM_STRETCH:
      p->u.stretch.object = it->object;
      break;
    }
  p->position = it->position;
  p->current = it->current;
  p->end_charpos = it->end_charpos;
  p->string_nchars = it->string_nchars;
  p->area = it->area;
  p->multibyte_p = it->multibyte_p;
  p->space_width = it->space_width;
  p->font_height = it->font_height;
  p->voffset = it->voffset;
  p->string_from_display_prop_p = it->string_from_display_prop_p;
  p->display_ellipsis_p = 0;

  xassert (it->sp > 0);
  --it->sp;
  p = it->stack + it->sp;
  it->stop_charpos = p->stop_charpos;
  it->face_id = p->face_id;
  it->current = p->current;
  it->position = p->position;
  it->string = p->string;
  if (NILP (it->string))
    SET_TEXT_POS (it->current.string_pos, -1, -1);
  it->method = p->method;
  switch (it->method)
    {
    case GET_FROM_IMAGE:
      it->image_id = p->u.image.image_id;
      it->object = p->u.image.object;
      it->slice = p->u.image.slice;
      break;
    case GET_FROM_COMPOSITION:
      it->object = p->u.comp.object;
      it->c = p->u.comp.c;
      it->len = p->u.comp.len;
      it->cmp_id = p->u.comp.cmp_id;
      it->cmp_len = p->u.comp.cmp_len;
      break;
    case GET_FROM_STRETCH:
      it->object = p->u.comp.object;
      break;
    }
  it->end_charpos = p->end_charpos;
  it->string_nchars = p->string_nchars;
  it->area = p->area;
  it->multibyte_p = p->multibyte_p;
  it->space_width = p->space_width;
  it->font_height = p->font_height;
  it->voffset = p->voffset;
  it->string_from_display_prop_p = p->string_from_display_prop_p;
}

     struct it *it;
{
  while (IT_CHARPOS (*it) > BEGV)
    {
      back_to_previous_line_start (it);

      if (IT_CHARPOS (*it) <= BEGV)
	break;

      /* If selective > 0, then lines indented more than that values
	 are invisible.  */

				     Qinvisible, it->window);
	if (TEXT_PROP_MEANS_INVISIBLE (prop))
	  continue;
      }

      if (IT_CHARPOS (*it) <= BEGV)
	break;

      {
	struct it it2;
	int pos;
	int beg, end;
	Lisp_Object val, overlay;

	/* If newline is part of a composition, continue from start of composition */
	if (find_composition (IT_CHARPOS (*it), -1, &beg, &end, &val, Qnil)
	    && beg < IT_CHARPOS (*it))
	  goto replaced;

	/* If newline is replaced by a display property, find start of overlay
	   or interval and continue search from that point.  */
	it2 = *it;
	pos = --IT_CHARPOS (it2);
	--IT_BYTEPOS (it2);
	it2.sp = 0;
	if (handle_display_prop (&it2) == HANDLED_RETURN
	    && !NILP (val = get_char_property_and_overlay
		      (make_number (pos), Qdisplay, Qnil, &overlay))
	    && (OVERLAYP (overlay)
		? (beg = OVERLAY_POSITION (OVERLAY_START (overlay)))
		: get_property_and_range (pos, Qdisplay, &val, &beg, &end, Qnil)))
	  goto replaced;

	/* Newline is not replaced by anything -- so we are done.  */
	break;

      replaced:
	if (beg < BEGV)
	  beg = BEGV;
	IT_CHARPOS (*it) = beg;
	IT_BYTEPOS (*it) = buf_charpos_to_bytepos (current_buffer, beg);
      }
    }

  it->continuation_lines_width = 0;

  xassert (IT_CHARPOS (*it) >= BEGV);
  xassert (IT_CHARPOS (*it) == BEGV
	   || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
  CHECK_IT (it);

  it->current.overlay_string_index = -1;
  IT_STRING_CHARPOS (*it) = -1;
  IT_STRING_BYTEPOS (*it) = -1;
  it->string = Qnil;
  it->method = GET_FROM_BUFFER;
  it->object = it->w->buffer;
  it->area = TEXT_AREA;
  it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
  it->sp = 0;
  it->string_from_display_prop_p = 0;
  it->face_before_selective_p = 0;

  if (set_stop_p)
    it->stop_charpos = CHARPOS (pos);
}

	}
      break;

    case GET_FROM_COMPOSITION:
      xassert (it->cmp_id >= 0 && it->cmp_id < n_compositions);
      xassert (it->sp > 0);
      pop_it (it);
      if (it->method == GET_FROM_STRING)
	{
	  IT_STRING_BYTEPOS (*it) += it->len;
	  IT_STRING_CHARPOS (*it) += it->cmp_len;
	  it->object = it->string;
	  goto consider_string_end;
	}
      else if (it->method == GET_FROM_BUFFER)
	{
	  IT_BYTEPOS (*it) += it->len;
	  IT_CHARPOS (*it) += it->cmp_len;
	  it->object = it->w->buffer;
	}
      break;

    case GET_FROM_C_STRING:
      /* Current display element of IT is from a C string.  */

	  if (it->s)
	    it->method = GET_FROM_C_STRING;
	  else if (STRINGP (it->string))
	    it->method = GET_FROM_STRING;
	  else
	    {
	      it->method = GET_FROM_BUFFER;
	      it->object = it->w->buffer;
	    }

	  it->dpvec = NULL;
	  it->current.dpvec_index = -1;

	  /* Skip over characters which were displayed via IT->dpvec.  */

	     string, this time an overlay string, or a buffer.  */
	  if (IT_STRING_CHARPOS (*it) == SCHARS (it->string)
	      && it->sp > 0)
	    {
	      pop_it (it);
	      if (it->method == GET_FROM_STRING)
		goto consider_string_end;
	    }
	}
      break;

    case GET_FROM_IMAGE:

      /* The position etc with which we have to proceed are on
	 the stack.  The position may be at the end of a string,
         if the `display' property takes up the whole string.  */
      xassert (it->sp > 0);
      pop_it (it);
      if (it->method == GET_FROM_STRING)
	goto consider_string_end;
      break;

    default:
      /* There are no other methods defined, so this should be a bug.  */
      abort ();

	 face we find after the invisible text.  Remember what it
	 was in IT->saved_face_id, and signal that it's there by
	 setting face_before_selective_p.  */
      it->saved_face_id = it->face_id;
      it->method = GET_FROM_BUFFER;
      it->object = it->w->buffer;
      reseat_at_next_visible_line_start (it, 1);
      it->face_before_selective_p = 1;
    }

  return get_next_display_element (it);

  it->position = (STRINGP (it->string)
		  ? it->current.string_pos
		  : it->current.pos);
  if (STRINGP (it->string))
    it->object = it->string;
  else
    it->object = it->w->buffer;
  return 1;
}




	      cursor = 0;
	    }
	}
      else
	{
	  if (string_start == NULL)
	    {
	      string_before_pos = last_pos;
	      string_start = glyph;
	      string_start_x = x;
	    }
	  /* Skip all glyphs from string.  */
	  do
	    {
	      Lisp_Object cprop;
	      int pos;

	 are from string.  As there's no easy way to know the
	 character position of the current glyph, find the correct
	 glyph on point by scanning from string_start again.  */
      Lisp_Object limit;
      Lisp_Object string;
      struct glyph *stop = glyph;
      int pos;

      limit = make_number (pt_old + 1);
      glyph = string_start;
      x = string_start_x;
      string = glyph->object;
      pos = string_buffer_position (w, string, string_before_pos);
      /* If STRING is from overlay, LAST_POS == 0.  We skip such glyphs
	 because we always put cursor after overlay strings.  */
      while (pos == 0 && glyph < stop)
	{
	  string = glyph->object;
	  SKIP_GLYPHS (glyph, stop, x, EQ (glyph->object, string));
	  if (glyph < stop)
	    pos = string_buffer_position (w, glyph->object, string_before_pos);
	}

      while (glyph < stop)
	{
	  pos = XINT (Fnext_single_char_property_change
		      (make_number (pos), Qdisplay, Qnil, limit));
	  if (pos > pt_old)
	    break;
	  /* Skip glyphs from the same string.  */
	  string = glyph->object;
	  SKIP_GLYPHS (glyph, stop, x, EQ (glyph->object, string));
	  /* Skip glyphs from an overlay.  */
	  while (glyph < stop
		 && ! string_buffer_position (w, glyph->object, pos))
	    {
	      string = glyph->object;
	      SKIP_GLYPHS (glyph, stop, x, EQ (glyph->object, string));
	    }
	}

      /* If we reached the end of the line, and end was from a string,
	 cursor is not on this line.  */