diff options
author | dgp <dgp@users.sourceforge.net> | 2015-11-30 21:21:48 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2015-11-30 21:21:48 (GMT) |
commit | a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a (patch) | |
tree | 24ccb2318d04412685b1a4262df7c33df0864d34 /generic/tkFont.c | |
parent | ddb9e825e0b85f216d172f8b537257c8d58b0de9 (diff) | |
parent | b8bfd3505b511a3cc94297df7f04c55505d6df2c (diff) | |
download | tk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.zip tk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.tar.gz tk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.tar.bz2 |
merge 8.5
Diffstat (limited to 'generic/tkFont.c')
-rw-r--r-- | generic/tkFont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index 5d2ad43..7ff1ae9 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -2069,14 +2069,14 @@ Tk_ComputeTextLayout( NewChunk(&layoutPtr, &maxChunks, start, 1, curX, newX, baseline)->numDisplayChars = -1; start++; + curX = newX; + flags &= ~TK_AT_LEAST_ONE; if ((start < end) && ((wrapLength <= 0) || (newX <= wrapLength))) { /* * More chars can still fit on this line. */ - curX = newX; - flags &= ~TK_AT_LEAST_ONE; continue; } } else { |