summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2012-11-05 21:55:40 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2012-11-05 21:55:40 (GMT)
commitda8e7d4661b94a3128d7ec74ba87a13d6e11ec8b (patch)
tree69e6de205b585b6e672cdf76b45b53d726e44538
parentd6863f1280a5a5316be007283225d8e35260bc44 (diff)
parent2e165c349a1c7b8d6a62f5b97adfff7f2b0ae80f (diff)
downloadtcl-da8e7d4661b94a3128d7ec74ba87a13d6e11ec8b.zip
tcl-da8e7d4661b94a3128d7ec74ba87a13d6e11ec8b.tar.gz
tcl-da8e7d4661b94a3128d7ec74ba87a13d6e11ec8b.tar.bz2
merge main dev branch
-rw-r--r--changes8
-rw-r--r--generic/tclBasic.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/changes b/changes
index b902445..af236f3 100644
--- a/changes
+++ b/changes
@@ -8108,7 +8108,7 @@ and Tcl_FSMountsChanged(). (porter)
2012-08-25 (bug fix)[3561330] Ukranian translation of "March" (teterin)
-2012-09-12 (TIP 404) New msgcat commands [mcflset], [mcflmset] (oehlmann)
+2012-09-07 (TIP 404) New msgcat commands [mcflset], [mcflmset] (oehlmann)
=> msgcat 1.5.0
Many revisions to better support a Cygwin environment (nijtmans)
@@ -8116,3 +8116,9 @@ Many revisions to better support a Cygwin environment (nijtmans)
Dropped support for OS X versions less than 10.4 (Tiger) (fellows)
--- Released 8.6b3, September 18, 2012 --- See ChangeLog for details ---
+
+2012-10-03 (bug fix) exit panic on stacked std channel (griffin,porter)
+
+2012-10-14 (bug fix) [tcl::Bgerror] crash on non-dict options (nijtmans)
+
+--- Released 8.6.0, ??? ??, 2012 --- See ChangeLog for details ---
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index bce6479..cbdbe87 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -247,7 +247,7 @@ static const CmdInfo builtInCmds[] = {
{"split", Tcl_SplitObjCmd, NULL, NULL, 1},
{"subst", Tcl_SubstObjCmd, TclCompileSubstCmd, TclNRSubstObjCmd, 1},
{"switch", Tcl_SwitchObjCmd, TclCompileSwitchCmd, TclNRSwitchObjCmd, 1},
- {"tailcall", NULL, TclCompileTailcallCmd, TclNRTailcallObjCmd, 1},
+ {"tailcall", NULL, NULL, TclNRTailcallObjCmd, 1},
{"throw", Tcl_ThrowObjCmd, TclCompileThrowCmd, NULL, 1},
{"trace", Tcl_TraceObjCmd, NULL, NULL, 1},
{"try", Tcl_TryObjCmd, TclCompileTryCmd, TclNRTryObjCmd, 1},