mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 20:50:52 -08:00
Code Issues Projects Releases Wiki Activity

(display_text_line): Enter a char in charstarts

Browse source 
at the very end of the character loop.
Enter newline or ^M (if selective display) separately.
This commit is contained in:
Karl Heuer 1995-05-22 22:22:32 +00:00
parent c9ddd39de4
commit 545e04f631
1 changed files with 59 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

78
src/xdisp.c
View file

@ -2618,25 +2618,6 @@ display_text_line (w, start, vpos, hpos, taboffset)
p = &FETCH_CHAR (pos);
}
/* Do nothing here for a char that's entirely off the left edge. */
if (p1 >= leftmargin)
{
/* For all the glyphs occupied by this character, except for the
first, store -1 in charstarts. */
if (p1 != p1prev)
{
int *p2x = &charstart[(p1prev < leftmargin
? leftmargin : p1prev)
- p1start];
int *p2 = &charstart[(p1 < endp ? p1 : endp) - p1start];
if (p2x < p2)
*p2x++ = prevpos;
while (p2x < p2)
*p2x++ = -1;
}
}
if (p1 >= endp)
break;
@ -2691,6 +2672,25 @@ display_text_line (w, start, vpos, hpos, taboffset)
*p1++ = FAST_MAKE_GLYPH (' ', current_face);
}
#endif
/* Update charstarts for the newline that ended this line. */
/* Do nothing here for a char that's entirely off the left edge
or if it starts at the right edge. */
if (p1 >= leftmargin && p1prev != endp)
{
/* Store the newline's position into charstarts
for the column where the newline starts.
Store -1 for the rest of the glyphs it occupies. */
int *p2x = &charstart[(p1prev < leftmargin
? leftmargin : p1prev)
- p1start];
int *p2 = &charstart[(p1 < endp ? p1 : endp) - p1start];
*p2x++ = pos;
while (p2x < p2)
*p2x++ = -1;
}
break;
}
else if (c == '\t')
@ -2728,6 +2728,24 @@ display_text_line (w, start, vpos, hpos, taboffset)
*p1++ = FAST_MAKE_GLYPH (' ', current_face);
}
#endif
/* Update charstarts for the ^M that ended this line. */
/* Do nothing here for a char that's entirely off the left edge
or if it starts at the right edge. */
if (p1 >= leftmargin && p1prev != endp)
{
/* Store the newline's position into charstarts
for the column where the newline starts.
Store -1 for the rest of the glyphs it occupies. */
int *p2x = &charstart[(p1prev < leftmargin
? leftmargin : p1prev)
- p1start];
int *p2 = &charstart[(p1 < endp ? p1 : endp) - p1start];
*p2x++ = pos;
while (p2x < p2)
*p2x++ = -1;
}
break;
}
else if (c < 0200 && ctl_arrow)
@ -2761,6 +2779,28 @@ display_text_line (w, start, vpos, hpos, taboffset)
prevpos = pos;
pos++;
/* Update charstarts for the character just output. */
/* Do nothing here for a char that's entirely off the left edge. */
if (p1 >= leftmargin)
{
/* Store the char's position into charstarts
for the first glyph occupied by this char.
Store -1 for the rest of the glyphs it occupies. */
if (p1 != p1prev)
{
int *p2x = &charstart[(p1prev < leftmargin
? leftmargin : p1prev)
- p1start];
int *p2 = &charstart[(p1 < endp ? p1 : endp) - p1start];
if (p2x < p2)
*p2x++ = prevpos;
while (p2x < p2)
*p2x++ = -1;
}
}
}
val.hpos = - XINT (w->hscroll);