Merge with trunk revision 40072

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@40131 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-10-05 21:18:43 +00:00
parent fd11511309
commit ab97ddee5f
9 changed files with 12 additions and 21 deletions

View file

@ -911,9 +911,7 @@ has the same y origin and height as the line frag rect it is in.
fraction_through = 1.0;
}
else
{
[self _doLayoutToGlyph: glyph_index];
}
for (tc = textcontainers, i = 0; i < num_textcontainers; i++, tc++)
if (tc->pos + tc->length > glyph_index)
@ -2959,11 +2957,13 @@ no_soft_invalidation:
else
{ /* before before */
}
/* sanity check */
if (NSMaxRange(newRange) > [_textStorage length])
{
newRange = NSMakeRange(MIN(range.location, [_textStorage length]), 0);
}
/* If there are text views attached to us, let them handle the
change. */
if ([self firstTextView])