summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2010-11-05 00:06:58 (GMT)
committerKevin B Kenny <kennykb@acm.org>2010-11-05 00:06:58 (GMT)
commit9544dc11316230740f6e007f3be2888590f4d688 (patch)
treea404b6597d3af6e288049ff1bc06372b5944ab12
parentfddfd6f3b5579bb251e16f894613dd1660bd60da (diff)
downloadtcl-9544dc11316230740f6e007f3be2888590f4d688.zip
tcl-9544dc11316230740f6e007f3be2888590f4d688.tar.gz
tcl-9544dc11316230740f6e007f3be2888590f4d688.tar.bz2
Backport dgp's fixes to comments and ChangeLog entry
-rw-r--r--ChangeLog2
-rw-r--r--generic/tclCompCmds.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 41de67c..eb31a48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
2010-11-03 Kevin B. Kenny <kennykb@acm.org>
* generic/tclCompCmds.c (TclCompileCatchCmd):
- * tests/compile.test (compile-3,6): Reworked the compilation of
+ * tests/compile.test (compile-3.6): Reworked the compilation of
the [catch] command so as to avoid placing any code that might
throw an exception (specifically, any initial substitutions
or any stores to result or options variables) between the
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index c520aef..5f25c59 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCompCmds.c,v 1.143.2.3 2010/11/03 00:58:04 kennykb Exp $
+ * RCS: @(#) $Id: tclCompCmds.c,v 1.143.2.4 2010/11/05 00:06:58 kennykb Exp $
*/
#include "tclInt.h"
@@ -557,7 +557,7 @@ TclCompileCatchCmd(
TclEmitOpcode(INST_POP, envPtr);
/*
- * Stack is now ?script? result returnCode.
+ * Stack is now ?script? ?returnOptions? returnCode.
* If the options dict has been requested, it is buried on the stack
* under the return code. Reverse the stack to bring it to the top,
* store it and remove it from the stack.