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 | trunk |
| Files: | files | file ages | folders |
| SHA1: |
134e487b227864429a7c7ab99b77ed9a |
| User & Date: | jan.nijtmans 2017-09-04 12:38:14 |
Context
|
2017-09-04
| ||
| 14:01 | Merge core-8-6-branch to trunk, especially the 1.6.0 -> 1.6.1 renumbering from msgcat check-in: d077ae59a3 user: jan.nijtmans tags: trunk | |
| 12:40 | merge trunk check-in: 1f080164e9 user: jan.nijtmans tags: tip-439, semver | |
| 12:38 | merge core-8-6-branch check-in: 134e487b22 user: jan.nijtmans tags: trunk | |
| 12:37 | Typo's (Thanks to Gustaf Neumann), nothing functional. check-in: 4e7c82c6e1 user: jan.nijtmans tags: core-8-6-branch | |
|
2017-09-02
| ||
| 22:10 | [0e4d88b650] Allow command overwrite when deletion callback deletes namespace. check-in: 95c4436a1e user: dgp tags: trunk | |
Changes
Changes to generic/tclBasic.c.
| ︙ | ︙ | |||
2104 2105 2106 2107 2108 2109 2110 |
* deleted - We've already deleted a conflicting command
*/
break;
}
/* An existing command conflicts. Try to delete it.. */
cmdPtr = Tcl_GetHashValue(hPtr);
| | | 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 |
* deleted - We've already deleted a conflicting command
*/
break;
}
/* An existing command conflicts. Try to delete it.. */
cmdPtr = Tcl_GetHashValue(hPtr);
/*
* Be careful to preserve
* any existing import links so we can restore them down below. That
* way, you can redefine a command and its import status will remain
* intact.
*/
|
| ︙ | ︙ |
Changes to generic/tclEncoding.c.
| ︙ | ︙ | |||
2325 2326 2327 2328 2329 2330 2331 |
}
if (dst > dstEnd) {
result = TCL_CONVERT_NOSPACE;
break;
}
if (UCHAR(*src) < 0x80 && !(UCHAR(*src) == 0 && pureNullMode == 0)) {
/*
| | | 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 |
}
if (dst > dstEnd) {
result = TCL_CONVERT_NOSPACE;
break;
}
if (UCHAR(*src) < 0x80 && !(UCHAR(*src) == 0 && pureNullMode == 0)) {
/*
* Copy 7bit characters, but skip null-bytes when we are in input
* mode, so that they get converted to 0xc080.
*/
*dst++ = *src++;
} else if (pureNullMode == 1 && UCHAR(*src) == 0xc0 &&
(src + 1 < srcEnd) && UCHAR(*(src+1)) == 0x80) {
/*
|
| ︙ | ︙ | |||
3376 3377 3378 3379 3380 3381 3382 | tablePrefixBytes = (const char *) tableDataPtr->prefixBytes; tableFromUnicode = (const unsigned short *const *) tableDataPtr->fromUnicode; /* * The state variable has the value of oldState when word is 0. | | | 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 |
tablePrefixBytes = (const char *) tableDataPtr->prefixBytes;
tableFromUnicode = (const unsigned short *const *)
tableDataPtr->fromUnicode;
/*
* The state variable has the value of oldState when word is 0.
* In this case, the escape sequence should not be copied to dst
* because the current character set is not changed.
*/
if (state != oldState) {
subTablePtr = &dataPtr->subTables[state];
if ((dst + subTablePtr->sequenceLen) > dstEnd) {
/*
|
| ︙ | ︙ |