diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-03 18:42:03 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-03 18:42:03 (GMT) |
| commit | 6e5bee537f289d191bad01f4df94197a00639f7f (patch) | |
| tree | 02051292fbd58f1a5350c8c8a63b21605a2284d4 | |
| parent | 6ca9bef06dc59c373c3f6e6630ac716945ee0bbf (diff) | |
| parent | a52cfae90040fcfebac8aef0c52731bd67864165 (diff) | |
| download | tcl-6e5bee537f289d191bad01f4df94197a00639f7f.zip tcl-6e5bee537f289d191bad01f4df94197a00639f7f.tar.gz tcl-6e5bee537f289d191bad01f4df94197a00639f7f.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | doc/string.n | 6 | ||||
| -rw-r--r-- | generic/tclEvent.c | 3 | ||||
| -rw-r--r-- | tests/compile.test | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/doc/string.n b/doc/string.n index 7e666ea..8d8be3d 100644 --- a/doc/string.n +++ b/doc/string.n @@ -333,21 +333,21 @@ specified using the forms described in \fBSTRING INDICES\fR. Returns a value equal to \fIstring\fR except that any leading or trailing characters present in the string given by \fIchars\fR are removed. If \fIchars\fR is not specified then white space is removed (any character -for which \fBstring is space\fR returns 1, and "\0"). +for which \fBstring is space\fR returns 1, and "\e0"). .TP \fBstring trimleft \fIstring\fR ?\fIchars\fR? . Returns a value equal to \fIstring\fR except that any leading characters present in the string given by \fIchars\fR are removed. If \fIchars\fR is not specified then white space is removed (any character -for which \fBstring is space\fR returns 1, and "\0"). +for which \fBstring is space\fR returns 1, and "\e0"). .TP \fBstring trimright \fIstring\fR ?\fIchars\fR? . Returns a value equal to \fIstring\fR except that any trailing characters present in the string given by \fIchars\fR are removed. If \fIchars\fR is not specified then white space is removed (any character -for which \fBstring is space\fR returns 1, and "\0"). +for which \fBstring is space\fR returns 1, and "\e0"). .SS "OBSOLETE SUBCOMMANDS" .PP These subcommands are currently supported, but are likely to go away in a diff --git a/generic/tclEvent.c b/generic/tclEvent.c index 02d14b4..79985ed 100644 --- a/generic/tclEvent.c +++ b/generic/tclEvent.c @@ -1467,8 +1467,7 @@ VwaitVarProc( int *donePtr = clientData; *donePtr = 1; - Tcl_UntraceVar2(interp, name1, name2, - TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, + Tcl_UntraceVar(interp, name1, TCL_TRACE_WRITES|TCL_TRACE_UNSETS, VwaitVarProc, clientData); return NULL; } diff --git a/tests/compile.test b/tests/compile.test index 89fe8dc..0a29c15 100644 --- a/tests/compile.test +++ b/tests/compile.test @@ -497,7 +497,7 @@ test compile-13.2 {TclCompileScript: testing expected nested scripts compilation # with 2000 (1000 in debug) nested scripts (bodies). If you get SO/SF exceptions on some low-stack # boxes or systems, please don't decrease it (either provide a constraint) ti eval {foreach cmd {eval "if 1" try catch} { - set c [gencode [expr {![info exists ::tcl_platform(debug)] ? 2000 : 1000}] $cmd] + set c [gencode [expr {![::tcl::pkgconfig get debug] ? 2000 : 1000}] $cmd] if 1 $c }} ti eval {set result} |