From 9028e5825b7fb7395e842ac60486fc7b54d30f4e Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Fri, 16 Sep 2011 13:22:39 +0000
Subject: 	* generic/tclProc.c (ProcWrongNumArgs): [Bugs
 3400658,3408830]: 	Corrected the handling of procedure error messages
 (found by TclOO).

---
 ChangeLog         | 5 +++++
 generic/tclProc.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d0d5ed2..f20595e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-16  Donal K. Fellows  <dkf@users.sf.net>
+
+	* generic/tclProc.c (ProcWrongNumArgs): [Bugs 3400658,3408830]:
+	Corrected the handling of procedure error messages (found by TclOO).
+
 2011-09-16  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tcl.h:        Don't change Tcl_UniChar type when
diff --git a/generic/tclProc.c b/generic/tclProc.c
index 89bd0b9..43e88c6 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -1092,6 +1092,8 @@ ProcWrongNumArgs(
     if (framePtr->isProcCallFrame & FRAME_IS_LAMBDA) {
 	desiredObjs[0] = Tcl_NewStringObj("lambdaExpr", -1);
     } else {
+	((Interp *) interp)->ensembleRewrite.numInsertedObjs -= skip - 1;
+
 #ifdef AVOID_HACKS_FOR_ITCL
 	desiredObjs[0] = framePtr->objv[skip-1];
 #else
-- 
cgit v0.12