Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix in handling options -start/endline. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | revised_text | tip-466 |
| Files: | files | file ages | folders |
| SHA1: |
af2458bb34eeffa6a776df56abacdeee |
| User & Date: | gcramer 2017-04-26 10:31:52 |
Context
|
2017-04-26
| ||
| 19:20 | (1) Watch command now triggers changes in image or window. (2) Handling of the watch command a bit simplified. (3) Update of manual. (4) Minor fix in text-27.26. check-in: 40340286 user: gcramer tags: revised_text, tip-466 | |
| 10:31 | Fix in handling options -start/endline. check-in: af2458bb user: gcramer tags: revised_text, tip-466 | |
| 09:59 | Minor corrections in comments. check-in: 644e9ee4 user: gcramer tags: revised_text, tip-466 | |
Changes
Changes to generic/tkText.c.
| ︙ | ︙ | |||
1648 1649 1650 1651 1652 1653 1654 |
if (!objPtr) {
result = TCL_ERROR;
goto done;
}
Tcl_SetObjResult(interp, objPtr);
} else {
| < | 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 |
if (!objPtr) {
result = TCL_ERROR;
goto done;
}
Tcl_SetObjResult(interp, objPtr);
} else {
result = TkConfigureText(interp, textPtr, objc - 2, objv + 2);
}
break;
case TEXT_COUNT: {
TkTextIndex indexFrom, indexTo;
Tcl_Obj *objPtr = NULL;
bool update = false;
|
| ︙ | ︙ | |||
3867 3868 3869 3870 3871 3872 3873 |
free(myObjv);
if (rc != TCL_OK) {
goto error;
}
}
| | | 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 |
free(myObjv);
if (rc != TCL_OK) {
goto error;
}
}
if ((mask & TK_TEXT_INDEX_RANGE) == TK_TEXT_LINE_RANGE) {
TkTextIndexClear2(&start, NULL, tree);
TkTextIndexClear2(&end, NULL, tree);
TkTextIndexSetToStartOfLine2(&start, textPtr->startLine ?
textPtr->startLine : TkBTreeGetStartLine(textPtr));
TkTextIndexSetToStartOfLine2(&end, textPtr->endLine ?
textPtr->endLine : TkBTreeGetLastLine(textPtr));
if (textPtr->endLine && textPtr->startLine != textPtr->endLine) {
|
| ︙ | ︙ | |||
4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 |
if (mask & TK_TEXT_INDEX_RANGE) {
if (textPtr->newStartIndex) {
if (!TkTextGetIndexFromObj(interp, sharedTextPtr->mainPeer,
textPtr->newStartIndex, &start)) {
goto error;
}
}
if (textPtr->newEndIndex) {
if (!TkTextGetIndexFromObj(interp, sharedTextPtr->mainPeer, textPtr->newEndIndex, &end)) {
goto error;
}
}
if (TkTextIndexCompare(&start, &end) > 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"-startindex must be less than or equal to -endindex", -1));
Tcl_SetErrorCode(interp, "TK", "TEXT", "INDEX_ORDER", NULL);
goto error;
}
| > > > > > > | 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 |
if (mask & TK_TEXT_INDEX_RANGE) {
if (textPtr->newStartIndex) {
if (!TkTextGetIndexFromObj(interp, sharedTextPtr->mainPeer,
textPtr->newStartIndex, &start)) {
goto error;
}
} else {
TkTextIndexClear(&start, textPtr);
TkTextIndexSetSegment(&start, textPtr->startMarker);
}
if (textPtr->newEndIndex) {
if (!TkTextGetIndexFromObj(interp, sharedTextPtr->mainPeer, textPtr->newEndIndex, &end)) {
goto error;
}
} else {
TkTextIndexClear(&end, textPtr);
TkTextIndexSetSegment(&end, textPtr->endMarker);
}
if (TkTextIndexCompare(&start, &end) > 0) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"-startindex must be less than or equal to -endindex", -1));
Tcl_SetErrorCode(interp, "TK", "TEXT", "INDEX_ORDER", NULL);
goto error;
}
|
| ︙ | ︙ |