diff options
| author | fvogelnew1@free.fr <fvogel> | 2014-12-05 20:36:25 (GMT) |
|---|---|---|
| committer | fvogelnew1@free.fr <fvogel> | 2014-12-05 20:36:25 (GMT) |
| commit | 36f4e252427bd066068c162fd7951f10840968bb (patch) | |
| tree | b31ad5b07ecf433617378f20b77ce8270f9f2049 /generic | |
| parent | 1cf5849a4cf8e8b32cdbe8475b9d4cd140e40478 (diff) | |
| parent | 0042a0ad529425168e39b59925371db0b4e835d8 (diff) | |
| download | tk-36f4e252427bd066068c162fd7951f10840968bb.zip tk-36f4e252427bd066068c162fd7951f10840968bb.tar.gz tk-36f4e252427bd066068c162fd7951f10840968bb.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) { /* |