diff options
| author | fvogel <fvogelnew1@free.fr> | 2014-12-05 20:36:25 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2014-12-05 20:36:25 (GMT) |
| commit | c3d0229cec20604126fb0074106c96fc3f082d02 (patch) | |
| tree | c5ce3069e1073e46d58d978fa84abf56ccc1a1c2 /generic | |
| parent | 4ccd3392912d78e23be5aad9be104d58f301c4b7 (diff) | |
| parent | dd3a3ee0e1986dacd24474e62f1a63a002362c4e (diff) | |
| download | tk-c3d0229cec20604126fb0074106c96fc3f082d02.zip tk-c3d0229cec20604126fb0074106c96fc3f082d02.tar.gz tk-c3d0229cec20604126fb0074106c96fc3f082d02.tar.bz2 | |
Merged from branch bug-7703f947aa
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkTextDisp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 3d442af..851ee3e 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -3382,7 +3382,8 @@ TkTextFindDisplayLineEnd( * of the original index within its display * line. */ { - if (!end && indexPtr->byteIndex == 0) { + if (!end && indexPtr->byteIndex == 0 + && !TkTextIsElided(textPtr, indexPtr, NULL)) { /* * Nothing to do. */ @@ -3461,8 +3462,9 @@ TkTextFindDisplayLineEnd( * this now. */ - *xOffset = DlineXOfIndex(textPtr, dlPtr, - indexPtr->byteIndex - dlPtr->index.byteIndex); + *xOffset = DlineXOfIndex(textPtr, dlPtr, + TkTextIndexCount(textPtr, &dlPtr->index, indexPtr, + COUNT_INDICES)); } if (end) { /* |