comparison src/xdisp.c @ 107603:0e2486128193

Retrospective commit from 2009-11-21. Fix cursor positioning on empty lines with overlays. xdisp.c (set_cursor_from_row): Fix cursor positioning on empty lines when integer values of `cursor' property is used on display strings.

107602:d44bdcba4457

     glyph has the avoid_cursor_p flag set.  */
  int match_with_avoid_cursor = 0;
  /* Non-zero means we've seen at least one glyph that came from a
     display string.  */
  int string_seen = 0;
  /* Largest buffer position seen during scan of glyph row.  */
  EMACS_INT bpos_max = 0;
  /* Last buffer position covered by an overlay string with an integer
     `cursor' property.  */
  EMACS_INT bpos_covered = 0;

  /* Skip over glyphs not having an object at the start and the end of

	      {
		bpos_covered = bpos_max + XINT (chprop);
		/* If the `cursor' property covers buffer positions up
		   to and including point, we should display cursor on
		   this glyph.  */
		if (bpos_covered >= pt_old)
		  {
		    cursor = glyph;
		    break;
		  }
	      }

	      {
		bpos_covered = bpos_max + XINT (chprop);
		/* If the `cursor' property covers buffer positions up
		   to and including point, we should display cursor on
		   this glyph.  */
		if (bpos_covered >= pt_old)
		  {
		    cursor = glyph;
		    break;
		  }
	      }

107603:0e2486128193

     glyph has the avoid_cursor_p flag set.  */
  int match_with_avoid_cursor = 0;
  /* Non-zero means we've seen at least one glyph that came from a
     display string.  */
  int string_seen = 0;
  /* Largest buffer position seen so far during scan of glyph row.  */
  EMACS_INT bpos_max = last_pos;
  /* Last buffer position covered by an overlay string with an integer
     `cursor' property.  */
  EMACS_INT bpos_covered = 0;

  /* Skip over glyphs not having an object at the start and the end of

	      {
		bpos_covered = bpos_max + XINT (chprop);
		/* If the `cursor' property covers buffer positions up
		   to and including point, we should display cursor on
		   this glyph.  */
		/* Implementation note: bpos_max == pt_old when, e.g.,
		   we are in an empty line, where bpos_max is set to
		   MATRIX_ROW_START_CHARPOS, see above.  */
		if (bpos_max <= pt_old && bpos_covered >= pt_old)
		  {
		    cursor = glyph;
		    break;
		  }
	      }

	      {
		bpos_covered = bpos_max + XINT (chprop);
		/* If the `cursor' property covers buffer positions up
		   to and including point, we should display cursor on
		   this glyph.  */
		if (bpos_max <= pt_old && bpos_covered >= pt_old)
		  {
		    cursor = glyph;
		    break;
		  }
	      }