diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-31 09:19:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-31 09:19:21 (GMT) |
| commit | 85d70230296a50fa8805dca4b6a7281746759c7a (patch) | |
| tree | 59e94c5c206dc93a5e6ba9c3fd901a94e9bf52fd /generic/tclExecute.c | |
| parent | cef09a18ae9b1a55404db45ade312b06880c0f65 (diff) | |
| parent | 91189c426903448dfa31ba4983c5d3035cb351a5 (diff) | |
| download | tcl-85d70230296a50fa8805dca4b6a7281746759c7a.zip tcl-85d70230296a50fa8805dca4b6a7281746759c7a.tar.gz tcl-85d70230296a50fa8805dca4b6a7281746759c7a.tar.bz2 | |
merge core-8-6-branch (except: the "timerate" command and the clock performance-tests are kept)
Diffstat (limited to 'generic/tclExecute.c')
| -rw-r--r-- | generic/tclExecute.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 2d1c07f..30ef536 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -2695,7 +2695,7 @@ TEBCresume( if (objv[0]->bytes == &tclEmptyString) { objResultPtr = objv[1]; goto endINST_STR_CONCAT1; - } + } else if (objv[1]->bytes == &tclEmptyString) { objResultPtr = objv[0]; |