diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-16 08:30:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-16 08:30:17 (GMT) |
| commit | 5dc64243f3f775ae55cb5279993393657c99bb0f (patch) | |
| tree | 451376147b090249350e5ffffa780c92c4e47cbc | |
| parent | 3eb07e538c3bf623b1b048ccf5c866ea118b4e4f (diff) | |
| parent | d97e25b2ad96e4be2e23c349c2d0e6d44cab07e4 (diff) | |
| download | tcl-5dc64243f3f775ae55cb5279993393657c99bb0f.zip tcl-5dc64243f3f775ae55cb5279993393657c99bb0f.tar.gz tcl-5dc64243f3f775ae55cb5279993393657c99bb0f.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | generic/tclUtil.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c index eef6393..1904e2f 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -1708,7 +1708,8 @@ TclTrimRight( int pInc = 0, bytesLeft = numTrim; pp = TclUtfPrev(p, bytes); -#if TCL_UTF_MAX < 4 +#if TCL_UTF_MAX < 4 /* Needed because TclUtfPrev() cannot always jump back */ + /* sufficiently. See [d43f96c1a8] */ pp = TclUtfPrev(pp, bytes); #endif do { @@ -1721,14 +1722,14 @@ TclTrimRight( */ do { - int qInc = TclUtfToUCS4(q, &ch2); + pInc = TclUtfToUCS4(q, &ch2); if (ch1 == ch2) { break; } - q += qInc; - bytesLeft -= qInc; + q += pInc; + bytesLeft -= pInc; } while (bytesLeft); if (bytesLeft == 0) { |