Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | merge core-8-6-branch |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | rfe-6c0d7aec67 |
| Files: | files | file ages | folders |
| SHA1: |
5c5f5864c4de565b82b0d8989516269e |
| User & Date: | jan.nijtmans 2017-05-19 13:35:07 |
Context
|
2017-05-23
| ||
| 12:27 | merge core-8-6-branch check-in: 1dd9a820 user: jan.nijtmans tags: rfe-6c0d7aec67 | |
|
2017-05-19
| ||
| 13:35 | merge core-8-6-branch check-in: 5c5f5864 user: jan.nijtmans tags: rfe-6c0d7aec67 | |
| 13:33 | Eliminate empty if() statement, if DEBUG_LAYOUT_WITH_BASE_CHUNKS is not defined. (backported from androwish. Thanks, Christian!) check-in: 4a4cce3d user: jan.nijtmans tags: core-8-6-branch | |
| 13:29 | merge core-8-6-branch check-in: da86391c user: jan.nijtmans tags: rfe-6c0d7aec67 | |
Changes
Changes to generic/tkTextDisp.c.
| ︙ | ︙ | |||
8977 8978 8979 8980 8981 8982 8983 8984 8985 |
/*
* Remove the chunk data from the base chunk data.
*/
bciPtr = baseCharChunkPtr->clientData;
if ((ciPtr->baseOffset + ciPtr->numBytes)
!= Tcl_DStringLength(&bciPtr->baseChars)) {
| > < < > | 8977 8978 8979 8980 8981 8982 8983 8984 8985 8986 8987 8988 8989 8990 8991 8992 8993 8994 8995 8996 8997 |
/*
* Remove the chunk data from the base chunk data.
*/
bciPtr = baseCharChunkPtr->clientData;
#ifdef DEBUG_LAYOUT_WITH_BASE_CHUNKS
if ((ciPtr->baseOffset + ciPtr->numBytes)
!= Tcl_DStringLength(&bciPtr->baseChars)) {
fprintf(stderr,"RemoveFromBaseChunk called with wrong chunk "
"(not last)\n");
}
#endif
Tcl_DStringSetLength(&bciPtr->baseChars, ciPtr->baseOffset);
/*
* Invalidate the stored pixel width of the base chunk.
*/
|
| ︙ | ︙ |