diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-04-09 08:46:04 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-04-09 08:46:04 (GMT) |
| commit | 869730bf85067c15e36cab14904da2bda45cb84a (patch) | |
| tree | 154cf0eefc9afc0f6472f88e6975e9572afcd815 | |
| parent | 6ed025f0c6dbc01511a05bd87be92dc7d3dbb77d (diff) | |
| parent | e4912abbd2b65403ba09d78d791e107e2d70fdba (diff) | |
| download | tcl-869730bf85067c15e36cab14904da2bda45cb84a.zip tcl-869730bf85067c15e36cab14904da2bda45cb84a.tar.gz tcl-869730bf85067c15e36cab14904da2bda45cb84a.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | .travis.yml | 31 | ||||
| -rw-r--r-- | doc/interp.n | 2 | ||||
| -rw-r--r-- | generic/tclVar.c | 2 | ||||
| -rw-r--r-- | tests/cmdMZ.test | 4 |
4 files changed, 35 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 3770e07..59b52eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -160,6 +160,22 @@ matrix: - wine env: - BUILD_DIR=win + - CFGOPT="--host=i686-w64-mingw32 --disable-shared" + - NO_DIRECT_TEST=1 + - os: linux + dist: xenial + compiler: i686-w64-mingw32-gcc + addons: + apt: + packages: + - gcc-mingw-w64-base + - binutils-mingw-w64-i686 + - gcc-mingw-w64-i686 + - gcc-mingw-w64 + - gcc-multilib + - wine + env: + - BUILD_DIR=win - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=6" - NO_DIRECT_TEST=1 - os: linux @@ -223,6 +239,21 @@ matrix: - wine env: - BUILD_DIR=win + - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --disable-shared" + - NO_DIRECT_TEST=1 + - os: linux + dist: xenial + compiler: x86_64-w64-mingw32-gcc + addons: + apt: + packages: + - gcc-mingw-w64-base + - binutils-mingw-w64-x86-64 + - gcc-mingw-w64-x86-64 + - gcc-mingw-w64 + - wine + env: + - BUILD_DIR=win - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=6" - NO_DIRECT_TEST=1 - os: linux diff --git a/doc/interp.n b/doc/interp.n index e91e403..40ab9f9 100644 --- a/doc/interp.n +++ b/doc/interp.n @@ -201,7 +201,7 @@ slave interpreter identified by \fIpath\fR. If no arguments are given, option and current setting are returned. If \fB\-frame\fR is given, the debug setting is set to the given boolean if provided and the current setting is returned. -This only effects the output of \fBinfo frame\fR, in that exact +This only affects the output of \fBinfo frame\fR, in that exact frame-level information for command invocation at the bytecode level is only captured with this setting on. .RS diff --git a/generic/tclVar.c b/generic/tclVar.c index affc848..e400369 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.c @@ -736,7 +736,7 @@ TclObjLookupVarEx( * radical and destructive, so a better idea would be welcome. */ - /* + /* * Firstly set cached local var reference (avoid free before set, * see [45b9faf103f2]) */ diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test index 80258dc..5589e21 100644 --- a/tests/cmdMZ.test +++ b/tests/cmdMZ.test @@ -420,9 +420,9 @@ test cmdMZ-try-1.0 { set cmd try $cmd { lindex 5 - } on ok res {} + } on ok res {} set res - }} + }} } -result 5 |