summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-07-16 06:58:45 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-07-16 06:58:45 (GMT)
commit9b4bad2783cd4e6f9fefc8af4ade78391fb0d34e (patch)
tree87f601d73c5ef48e6695f0d2a570dd27b6f5ec18
parent6e3371ad0a917ded7faecca0b8111a82faf562c7 (diff)
parentf58326fab5907a37c419f42ee5a343063b0ba944 (diff)
downloadtcl-9b4bad2783cd4e6f9fefc8af4ade78391fb0d34e.zip
tcl-9b4bad2783cd4e6f9fefc8af4ade78391fb0d34e.tar.gz
tcl-9b4bad2783cd4e6f9fefc8af4ade78391fb0d34e.tar.bz2
Merge 8.6
-rw-r--r--generic/tclCmdMZ.c8
-rw-r--r--library/init.tcl2
-rw-r--r--library/safe.tcl2
3 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 6f71198..d37f5bf 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -5120,15 +5120,15 @@ TryPostHandler(
{
Tcl_Obj *resultObj, *cmdObj, *options, *handlerKindObj, **objv;
Tcl_Obj *finallyObj;
- int finally;
+ int finallyIndex;
objv = (Tcl_Obj **)data[0];
options = (Tcl_Obj *)data[1];
handlerKindObj = (Tcl_Obj *)data[2];
- finally = PTR2INT(data[3]);
+ finallyIndex = PTR2INT(data[3]);
cmdObj = objv[0];
- finallyObj = finally ? objv[finally] : 0;
+ finallyObj = finallyIndex ? objv[finallyIndex] : 0;
/*
* Check for limits/rewinding, which override normal trapping behaviour.
@@ -5172,7 +5172,7 @@ TryPostHandler(
/* The 'finally' script is always the last argument word. */
return TclNREvalObjEx(interp, finallyObj, 0, iPtr->cmdFramePtr,
- finally);
+ finallyIndex);
}
/*
diff --git a/library/init.tcl b/library/init.tcl
index 3f3b78f..a879fe5 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -591,7 +591,7 @@ proc auto_execok name {
}
set auto_execs($name) ""
- set shellBuiltins [list assoc cls copy date del dir echo erase ftype \
+ set shellBuiltins [list assoc cls copy date del dir echo erase exit ftype \
md mkdir mklink move rd ren rename rmdir start time type ver vol]
if {[info exists env(PATHEXT)]} {
# Add an initial ; to have the {} extension check first.
diff --git a/library/safe.tcl b/library/safe.tcl
index 3c01f75..2e04f8e 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -131,7 +131,7 @@ proc ::safe::interpConfigure {args} {
[list -accessPath $state(access_path)] \
[list -statics $state(staticsok)] \
[list -nested $state(nestedok)] \
- [list -deleteHook $state(cleanupHook)]]]
+ [list -deleteHook $state(cleanupHook)]]]
}
2 {
# If we have exactly 2 arguments the semantic is a "configure