comparison src/xdisp.c @ 108195:d3d8bc38d005

Fix a crash when a display string is continued to the next line. xdisp.c (set_cursor_from_row): When looping over a display string, don't overstep the end of the glyph row.

108194:65bda6b7d8b9

			     cursor on that character's glyph.  */
			  int strpos = glyph->charpos;

			  cursor = glyph;
			  for (glyph += incr;
			       EQ (glyph->object, str);
			       glyph += incr)
			    {
			      Lisp_Object cprop;
			      int gpos = glyph->charpos;

	    }

	  /* If we reached the end of the line, and END was from a string,
	     the cursor is not on this line.  */
	  if (cursor == NULL
	      && glyph == end
	      && STRINGP ((glyph - incr)->object)
	      && row->continued_p)
	    return 0;
	}
    }

108195:d3d8bc38d005

			     cursor on that character's glyph.  */
			  int strpos = glyph->charpos;

			  cursor = glyph;
			  for (glyph += incr;
			       (row->reversed_p ? glyph > stop : glyph < stop)
				 && EQ (glyph->object, str);
			       glyph += incr)
			    {
			      Lisp_Object cprop;
			      int gpos = glyph->charpos;

	    }

	  /* If we reached the end of the line, and END was from a string,
	     the cursor is not on this line.  */
	  if (cursor == NULL
	      && (row->reversed_p ? glyph <= end : glyph >= end)
	      && STRINGP (end->object)
	      && row->continued_p)
	    return 0;
	}
    }